Skip to content

Commit c8e7ca4

Browse files
burblebeetkoeppe
authored andcommitted
[ranges] Replace "using Base" declarations as requested in LWG3448
This replaces occurrences of "using Base = conditional_t<Const, const V, V>;" with "using Base = maybe-const<Const, V>;"
1 parent 5ea4ce4 commit c8e7ca4

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

source/ranges.tex

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3756,7 +3756,7 @@
37563756
using @\exposid{Parent}@ = // \expos
37573757
conditional_t<Const, const transform_view, transform_view>;
37583758
using @\exposid{Base}@ = // \expos
3759-
conditional_t<Const, const V, V>;
3759+
@\exposid{maybe-const}@<Const, V>;
37603760
iterator_t<@\exposid{Base}@> @\exposid{current_}@ = // \expos
37613761
iterator_t<@\exposid{Base}@>();
37623762
@\exposid{Parent}@* @\exposid{parent_}@ = nullptr; // \expos
@@ -4161,7 +4161,7 @@
41614161
private:
41624162
using @\exposid{Parent}@ = // \expos
41634163
conditional_t<Const, const transform_view, transform_view>;
4164-
using @\exposid{Base}@ = conditional_t<Const, const V, V>; // \expos
4164+
using @\exposid{Base}@ = @\exposid{maybe-const}@<Const, V>; // \expos
41654165
sentinel_t<@\exposid{Base}@> @\exposid{end_}@ = sentinel_t<@\exposid{Base}@>(); // \expos
41664166
public:
41674167
@\exposid{sentinel}@() = default;
@@ -4422,7 +4422,7 @@
44224422
template<bool Const>
44234423
class take_view<V>::@\exposid{sentinel}@ {
44244424
private:
4425-
using @\exposid{Base}@ = conditional_t<Const, const V, V>; // \expos
4425+
using @\exposid{Base}@ = @\exposid{maybe-const}@<Const, V>; // \expos
44264426
using @\exposid{CI}@ = counted_iterator<iterator_t<@\exposid{Base}@>>; // \expos
44274427
sentinel_t<@\exposid{Base}@> @\exposid{end_}@ = sentinel_t<@\exposid{Base}@>(); // \expos
44284428
public:
@@ -4598,7 +4598,7 @@
45984598
@\libconcept{indirect_unary_predicate}@<const Pred, iterator_t<V>>
45994599
template<bool Const>
46004600
class take_while_view<V, Pred>::@\exposid{sentinel}@ { // \expos
4601-
using @\exposid{Base}@ = conditional_t<Const, const V, V>; // \expos
4601+
using @\exposid{Base}@ = @\exposid{maybe-const}@<Const, V>; // \expos
46024602

46034603
sentinel_t<@\exposid{Base}@> @\exposid{end_}@ = sentinel_t<@\exposid{Base}@>(); // \expos
46044604
const Pred* @\exposid{pred_}@ = nullptr; // \expos
@@ -5037,7 +5037,7 @@
50375037
private:
50385038
using @\exposid{Parent}@ = // \expos
50395039
conditional_t<Const, const join_view, join_view>;
5040-
using @\exposid{Base}@ = conditional_t<Const, const V, V>; // \expos
5040+
using @\exposid{Base}@ = @\exposid{maybe-const}@<Const, V>; // \expos
50415041

50425042
static constexpr bool @\exposid{ref-is-glvalue}@ = // \expos
50435043
is_reference_v<range_reference_t<@\exposid{Base}@>>;
@@ -5349,7 +5349,7 @@
53495349
private:
53505350
using @\exposid{Parent}@ = // \expos
53515351
conditional_t<Const, const join_view, join_view>;
5352-
using @\exposid{Base}@ = conditional_t<Const, const V, V>; // \expos
5352+
using @\exposid{Base}@ = @\exposid{maybe-const}@<Const, V>; // \expos
53535353
sentinel_t<@\exposid{Base}@> @\exposid{end_}@ = sentinel_t<@\exposid{Base}@>(); // \expos
53545354
public:
53555355
@\exposid{sentinel}@() = default;
@@ -5549,7 +5549,7 @@
55495549
using @\exposid{Parent}@ = // \expos
55505550
conditional_t<Const, const split_view, split_view>;
55515551
using @\exposid{Base}@ = // \expos
5552-
conditional_t<Const, const V, V>;
5552+
@\exposid{maybe-const}@<Const, V>;
55535553
@\exposid{Parent}@* @\exposid{parent_}@ = nullptr; // \expos
55545554
iterator_t<@\exposid{Base}@> @\exposid{current_}@ = // \expos, present only if \tcode{V} models \libconcept{forward_range}
55555555
iterator_t<@\exposid{Base}@>();
@@ -5775,7 +5775,7 @@
57755775
template<bool Const>
57765776
struct split_view<V, Pattern>::@\exposid{inner-iterator}@ {
57775777
private:
5778-
using @\exposid{Base}@ = conditional_t<Const, const V, V>; // \expos
5778+
using @\exposid{Base}@ = @\exposid{maybe-const}@<Const, V>; // \expos
57795779
@\exposid{outer-iterator}@<Const> @\exposid{i_}@ = @\exposid{outer-iterator}@<Const>(); // \expos
57805780
bool @\exposid{incremented_}@ = false; // \expos
57815781
public:
@@ -6362,7 +6362,7 @@
63626362
@\exposconcept{has-tuple-element}@<remove_reference_t<range_reference_t<V>>, N>
63636363
template<bool Const>
63646364
class elements_view<V, N>::@\exposid{iterator}@ { // \expos
6365-
using @\exposid{Base}@ = conditional_t<Const, const V, V>; // \expos
6365+
using @\exposid{Base}@ = @\exposid{maybe-const}@<Const, V>; // \expos
63666366

63676367
iterator_t<@\exposid{Base}@> @\exposid{current_}@ = iterator_t<@\exposid{Base}@>();
63686368
public:
@@ -6706,7 +6706,7 @@
67066706
template<bool Const>
67076707
class elements_view<V, N>::@\exposid{sentinel}@ { // \expos
67086708
private:
6709-
using @\exposid{Base}@ = conditional_t<Const, const V, V>; // \expos
6709+
using @\exposid{Base}@ = @\exposid{maybe-const}@<Const, V>; // \expos
67106710
sentinel_t<@\exposid{Base}@> @\exposid{end_}@ = sentinel_t<@\exposid{Base}@>(); // \expos
67116711
public:
67126712
@\exposid{sentinel}@() = default;

0 commit comments

Comments
 (0)