From 9163bbcdc539efb19255869c34c6a7ba3b232d78 Mon Sep 17 00:00:00 2001 From: Hewill Kang <67143766+hewillk@users.noreply.github.com> Date: Mon, 29 Aug 2022 10:24:29 +0800 Subject: [PATCH 1/3] [range.slide.iterator] Add \exposid for iterator --- source/ranges.tex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/ranges.tex b/source/ranges.tex index 60fc640a98..afcfb31597 100644 --- a/source/ranges.tex +++ b/source/ranges.tex @@ -13036,7 +13036,7 @@ \end{itemdescr} \begin{itemdecl} -constexpr iterator& operator+=(difference_type x) +constexpr @\exposid{iterator}@& operator+=(difference_type x) requires @\libconcept{random_access_range}@<@\exposid{Base}@>; \end{itemdecl} From a24e2f9195437c1292b0917210f0be20048e99dc Mon Sep 17 00:00:00 2001 From: Hewill Kang <67143766+hewillk@users.noreply.github.com> Date: Mon, 29 Aug 2022 10:28:56 +0800 Subject: [PATCH 2/3] Update ranges.tex --- source/ranges.tex | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/ranges.tex b/source/ranges.tex index afcfb31597..9d2742c51d 100644 --- a/source/ranges.tex +++ b/source/ranges.tex @@ -12285,9 +12285,9 @@ requires @\libconcept{random_access_range}@<@\exposid{Base}@> && @\libconcept{three_way_comparable}@>; - friend constexpr iterator operator+(const @\exposid{iterator}@& i, difference_type n) + friend constexpr @\exposid{iterator}@ operator+(const @\exposid{iterator}@& i, difference_type n) requires @\libconcept{random_access_range}@<@\exposid{Base}@>; - friend constexpr iterator operator+(difference_type n, const @\exposid{iterator}@& i) + friend constexpr @\exposid{iterator}@ operator+(difference_type n, const @\exposid{iterator}@& i) requires @\libconcept{random_access_range}@<@\exposid{Base}@>; friend constexpr @\exposid{iterator}@ operator-(const @\exposid{iterator}@& i, difference_type n) requires @\libconcept{random_access_range}@<@\exposid{Base}@>; From e0001d70fccbc7ff0ded57518c343444fd416744 Mon Sep 17 00:00:00 2001 From: Hewill Kang <67143766+hewillk@users.noreply.github.com> Date: Mon, 29 Aug 2022 10:34:12 +0800 Subject: [PATCH 3/3] Update ranges.tex --- source/ranges.tex | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/ranges.tex b/source/ranges.tex index 9d2742c51d..3c47ffb16d 100644 --- a/source/ranges.tex +++ b/source/ranges.tex @@ -7216,7 +7216,7 @@ \end{itemdescr} \begin{itemdecl} -constexpr iterator(@\exposid{Parent}@& parent, iterator_t<@\exposid{Base}@> outer); +constexpr @\exposid{iterator}@(@\exposid{Parent}@& parent, iterator_t<@\exposid{Base}@> outer); \end{itemdecl} \begin{itemdescr} @@ -13760,7 +13760,7 @@ using iterator_concept = @\seebelow@; using iterator_category = @\seebelow@; // not always present - iterator() requires @\libconcept{default_initializable}@> = default; + @\exposid{iterator}@() requires @\libconcept{default_initializable}@> = default; constexpr @\exposid{iterator}@(@\exposid{iterator}@ other) requires Const && @\libconcept{convertible_to}@, iterator_t<@\exposid{Base}@>>