Skip to content

Commit ebd315d

Browse files
frederick-vs-jatkoeppe
authored andcommitted
[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, and for the return type of `as_const`, because the the change would affect mangled name.
1 parent 3ddbebd commit ebd315d

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

source/containers.tex

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

source/future.tex

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -576,8 +576,8 @@
576576
the \oldconcept{TransformationTrait} requirements
577577
with a member typedef \tcode{type} that names the following type:
578578
\begin{itemize}
579-
\item for the first specialization, \tcode{add_volatile_t<TE>}, and
580-
\item for the second specialization, \tcode{add_cv_t<TE>}.
579+
\item for the first specialization, \tcode{volatile TE}, and
580+
\item for the second specialization, \tcode{const volatile TE}.
581581
\end{itemize}
582582

583583
\pnum
@@ -631,8 +631,8 @@
631631
the \oldconcept{TransformationTrait} requirements
632632
with a member typedef \tcode{type} that names the following type:
633633
\begin{itemize}
634-
\item for the first specialization, \tcode{add_volatile_t<VA::type>}, and
635-
\item for the second specialization, \tcode{add_cv_t<VA::type>}.
634+
\item for the first specialization, \tcode{volatile VA::type}, and
635+
\item for the second specialization, \tcode{const volatile VA::type}.
636636
\end{itemize}
637637
\end{itemdescr}
638638

source/numerics.tex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12605,7 +12605,7 @@
1260512605
class @\libglobal{scaled_accessor}@ {
1260612606
public:
1260712607
using element_type =
12608-
add_const_t<decltype(declval<ScalingFactor>() * declval<NestedAccessor::element_type>())>;
12608+
const decltype(declval<ScalingFactor>() * declval<NestedAccessor::element_type>());
1260912609
using reference = remove_const_t<element_type>;
1261012610
using data_handle_type = NestedAccessor::data_handle_type;
1261112611
using offset_policy = scaled_accessor<ScalingFactor, NestedAccessor::offset_policy>;
@@ -12777,7 +12777,7 @@
1277712777
class @\libglobal{conjugated_accessor}@ {
1277812778
public:
1277912779
using element_type =
12780-
add_const_t<decltype(@\exposid{conj-if-needed}@(declval<NestedAccessor::element_type>()))>;
12780+
const decltype(@\exposid{conj-if-needed}@(declval<NestedAccessor::element_type>()));
1278112781
using reference = remove_const_t<element_type>;
1278212782
using data_handle_type = NestedAccessor::data_handle_type;
1278312783
using offset_policy = conjugated_accessor<NestedAccessor::offset_policy>;

source/utilities.tex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2842,7 +2842,7 @@
28422842
\pnum
28432843
Let \tcode{TE} denote \tcode{tuple_element_t<I, T>} of the cv-unqualified type \tcode{T}. Then
28442844
each specialization of the template meets the \oldconcept{TransformationTrait} requirements\iref{meta.rqmts}
2845-
with a member typedef \tcode{type} that names the type \tcode{add_const_t<TE>}.
2845+
with a member typedef \tcode{type} that names the type \tcode{const TE}.
28462846

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

65106510
\indexlibraryglobal{variant_alternative}%

0 commit comments

Comments
 (0)