Skip to content

Commit 6824e11

Browse files
[lib] Replace uses of add_meow_t with plain cv-qualifiers
...except for [tab:meta.trans.cv]. Because the wording change for `add_cv` seems a bit non-trivial.
1 parent 05300d7 commit 6824e11

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

source/containers.tex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11400,7 +11400,7 @@
1140011400
tuple_element_t<1, @\exposid{iter-value-type}@<InputIterator>>; // \expos
1140111401
template<class InputIterator>
1140211402
using @\placeholder{iter-to-alloc-type}@ = pair<
11403-
add_const_t<tuple_element_t<0, @\exposid{iter-value-type}@<InputIterator>>>,
11403+
const tuple_element_t<0, @\exposid{iter-value-type}@<InputIterator>>,
1140411404
tuple_element_t<1, @\exposid{iter-value-type}@<InputIterator>>>; // \expos
1140511405
template<ranges::@\libconcept{input_range}@ Range>
1140611406
using @\exposid{range-key-type}@ =
@@ -11409,7 +11409,7 @@
1140911409
using @\exposid{range-mapped-type}@ = typename ranges::range_value_t<Range>::second_type; // \expos
1141011410
template<ranges::@\libconcept{input_range}@ Range>
1141111411
using @\exposid{range-to-alloc-type}@ =
11412-
pair<add_const_t<typename ranges::range_value_t<Range>::first_type>,
11412+
pair<const typename ranges::range_value_t<Range>::first_type,
1141311413
typename ranges::range_value_t<Range>::second_type>; // \expos
1141411414
\end{codeblock}
1141511415

source/future.tex

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -561,8 +561,8 @@
561561
the \oldconcept{TransformationTrait} requirements
562562
with a member typedef \tcode{type} that names the following type:
563563
\begin{itemize}
564-
\item for the first specialization, \tcode{add_volatile_t<TE>}, and
565-
\item for the second specialization, \tcode{add_cv_t<TE>}.
564+
\item for the first specialization, \tcode{volatile TE}, and
565+
\item for the second specialization, \tcode{const volatile TE}.
566566
\end{itemize}
567567

568568
\pnum
@@ -616,8 +616,8 @@
616616
the \oldconcept{TransformationTrait} requirements
617617
with a member typedef \tcode{type} that names the following type:
618618
\begin{itemize}
619-
\item for the first specialization, \tcode{add_volatile_t<VA::type>}, and
620-
\item for the second specialization, \tcode{add_cv_t<VA::type>}.
619+
\item for the first specialization, \tcode{volatile VA::type}, and
620+
\item for the second specialization, \tcode{const volatile VA::type}.
621621
\end{itemize}
622622
\end{itemdescr}
623623

source/numerics.tex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12594,7 +12594,7 @@
1259412594
class @\libglobal{scaled_accessor}@ {
1259512595
public:
1259612596
using element_type =
12597-
add_const_t<decltype(declval<ScalingFactor>() * declval<NestedAccessor::element_type>())>;
12597+
const decltype(declval<ScalingFactor>() * declval<NestedAccessor::element_type>());
1259812598
using reference = remove_const_t<element_type>;
1259912599
using data_handle_type = NestedAccessor::data_handle_type;
1260012600
using offset_policy = scaled_accessor<ScalingFactor, NestedAccessor::offset_policy>;
@@ -12766,7 +12766,7 @@
1276612766
class @\libglobal{conjugated_accessor}@ {
1276712767
public:
1276812768
using element_type =
12769-
add_const_t<decltype(@\exposid{conj-if-needed}@(declval<NestedAccessor::element_type>()))>;
12769+
const decltype(@\exposid{conj-if-needed}@(declval<NestedAccessor::element_type>()));
1277012770
using reference = remove_const_t<element_type>;
1277112771
using data_handle_type = typename NestedAccessor::data_handle_type;
1277212772
using offset_policy = conjugated_accessor<NestedAccessor::offset_policy>;

source/utilities.tex

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363

6464
// \ref{utility.as.const}, \tcode{as_const}
6565
template<class T>
66-
constexpr add_const_t<T>& as_const(T& t) noexcept;
66+
constexpr const T& as_const(T& t) noexcept;
6767
template<class T>
6868
void as_const(const T&&) = delete;
6969

@@ -495,7 +495,7 @@
495495

496496
\indexlibraryglobal{as_const}%
497497
\begin{itemdecl}
498-
template<class T> constexpr add_const_t<T>& as_const(T& t) noexcept;
498+
template<class T> constexpr const T& as_const(T& t) noexcept;
499499
\end{itemdecl}
500500

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

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

59435943
\indexlibraryglobal{variant_alternative}%

0 commit comments

Comments
 (0)