Skip to content

[lib] Replace uses of add_meow_t with plain cv-qualifiers #7851

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions source/containers.tex
Original file line number Diff line number Diff line change
Expand Up @@ -11400,7 +11400,7 @@
tuple_element_t<1, @\exposid{iter-value-type}@<InputIterator>>; // \expos
template<class InputIterator>
using @\placeholder{iter-to-alloc-type}@ = pair<
add_const_t<tuple_element_t<0, @\exposid{iter-value-type}@<InputIterator>>>,
const tuple_element_t<0, @\exposid{iter-value-type}@<InputIterator>>,
tuple_element_t<1, @\exposid{iter-value-type}@<InputIterator>>>; // \expos
template<ranges::@\libconcept{input_range}@ Range>
using @\exposid{range-key-type}@ =
Expand All @@ -11409,7 +11409,7 @@
using @\exposid{range-mapped-type}@ = typename ranges::range_value_t<Range>::second_type; // \expos
template<ranges::@\libconcept{input_range}@ Range>
using @\exposid{range-to-alloc-type}@ =
pair<add_const_t<typename ranges::range_value_t<Range>::first_type>,
pair<const typename ranges::range_value_t<Range>::first_type,
typename ranges::range_value_t<Range>::second_type>; // \expos
\end{codeblock}

Expand Down
8 changes: 4 additions & 4 deletions source/future.tex
Original file line number Diff line number Diff line change
Expand Up @@ -561,8 +561,8 @@
the \oldconcept{TransformationTrait} requirements
with a member typedef \tcode{type} that names the following type:
\begin{itemize}
\item for the first specialization, \tcode{add_volatile_t<TE>}, and
\item for the second specialization, \tcode{add_cv_t<TE>}.
\item for the first specialization, \tcode{volatile TE}, and
\item for the second specialization, \tcode{const volatile TE}.
\end{itemize}

\pnum
Expand Down Expand Up @@ -616,8 +616,8 @@
the \oldconcept{TransformationTrait} requirements
with a member typedef \tcode{type} that names the following type:
\begin{itemize}
\item for the first specialization, \tcode{add_volatile_t<VA::type>}, and
\item for the second specialization, \tcode{add_cv_t<VA::type>}.
\item for the first specialization, \tcode{volatile VA::type}, and
\item for the second specialization, \tcode{const volatile VA::type}.
\end{itemize}
\end{itemdescr}

Expand Down
4 changes: 2 additions & 2 deletions source/numerics.tex
Original file line number Diff line number Diff line change
Expand Up @@ -12594,7 +12594,7 @@
class @\libglobal{scaled_accessor}@ {
public:
using element_type =
add_const_t<decltype(declval<ScalingFactor>() * declval<NestedAccessor::element_type>())>;
const decltype(declval<ScalingFactor>() * declval<NestedAccessor::element_type>());
using reference = remove_const_t<element_type>;
using data_handle_type = NestedAccessor::data_handle_type;
using offset_policy = scaled_accessor<ScalingFactor, NestedAccessor::offset_policy>;
Expand Down Expand Up @@ -12766,7 +12766,7 @@
class @\libglobal{conjugated_accessor}@ {
public:
using element_type =
add_const_t<decltype(@\exposid{conj-if-needed}@(declval<NestedAccessor::element_type>()))>;
const decltype(@\exposid{conj-if-needed}@(declval<NestedAccessor::element_type>()));
using reference = remove_const_t<element_type>;
using data_handle_type = typename NestedAccessor::data_handle_type;
using offset_policy = conjugated_accessor<NestedAccessor::offset_policy>;
Expand Down
8 changes: 4 additions & 4 deletions source/utilities.tex
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@

// \ref{utility.as.const}, \tcode{as_const}
template<class T>
constexpr add_const_t<T>& as_const(T& t) noexcept;
constexpr const T& as_const(T& t) noexcept;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This changes the mangled name for std::as_const specializations, but I don't think we need to care about that.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is a normative change though, so not editorial.

Copy link
Member

@jensmaurer jensmaurer Apr 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Understood; @frederick-vs-ja , please remove this change from the present editorial pull request and (at your option) create an LWG issue.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reverted.

template<class T>
void as_const(const T&&) = delete;

Expand Down Expand Up @@ -495,7 +495,7 @@

\indexlibraryglobal{as_const}%
\begin{itemdecl}
template<class T> constexpr add_const_t<T>& as_const(T& t) noexcept;
template<class T> constexpr const T& as_const(T& t) noexcept;
\end{itemdecl}

\begin{itemdescr}
Expand Down Expand Up @@ -2849,7 +2849,7 @@
\pnum
Let \tcode{TE} denote \tcode{tuple_element_t<I, T>} of the cv-unqualified type \tcode{T}. Then
each specialization of the template meets the \oldconcept{TransformationTrait} requirements\iref{meta.rqmts}
with a member typedef \tcode{type} that names the type \tcode{add_const_t<TE>}.
with a member typedef \tcode{type} that names the type \tcode{const TE}.

\pnum
In addition to being available via inclusion of the \libheader{tuple} header,
Expand Down Expand Up @@ -5937,7 +5937,7 @@
Let \tcode{VA} denote \tcode{variant_alternative<I, T>} of the
cv-unqualified type \tcode{T}. Then each specialization of the template
meets the \oldconcept{TransformationTrait} requirements\iref{meta.rqmts} with a
member typedef \tcode{type} that names the type \tcode{add_const_t<VA::type>}.
member typedef \tcode{type} that names the type \tcode{const VA::type}.
\end{itemdescr}

\indexlibraryglobal{variant_alternative}%
Expand Down
Loading