From 1f1bdfa0f7a2963074ec1bc42caf5ed1c0a85c5b Mon Sep 17 00:00:00 2001 From: Hewill Kang <67143766+hewillk@users.noreply.github.com> Date: Mon, 22 Aug 2022 11:51:32 +0800 Subject: [PATCH 1/2] [range.cartesian.view] Simplify cartesian-product-is-common --- source/ranges.tex | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/source/ranges.tex b/source/ranges.tex index a35eefb3c0..81b785c040 100644 --- a/source/ranges.tex +++ b/source/ranges.tex @@ -14286,10 +14286,9 @@ (@\libconcept{bidirectional_range}@<@\exposid{maybe-const}@> && @\exposconcept{cartesian-product-common-arg}@<@\exposid{maybe-const}@>)); - template + template concept @\defexposconcept{cartesian-product-is-common}@ = // \expos - (@\exposconcept{cartesian-product-common-arg}@ && ... && - @\exposconcept{cartesian-product-common-arg}@); + (@\exposconcept{cartesian-product-common-arg}@ && ...); template concept @\defexposconcept{cartesian-product-is-sized}@ = // \expos From 11a2d2c69863d9fbf7cc1d85be4b1a4001878f80 Mon Sep 17 00:00:00 2001 From: Hewill Kang <67143766+hewillk@users.noreply.github.com> Date: Mon, 22 Aug 2022 16:05:18 +0800 Subject: [PATCH 2/2] [range.cartesian.view] Fix cartesian-product-is-common --- source/ranges.tex | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/source/ranges.tex b/source/ranges.tex index 81b785c040..a764a4756a 100644 --- a/source/ranges.tex +++ b/source/ranges.tex @@ -14286,9 +14286,9 @@ (@\libconcept{bidirectional_range}@<@\exposid{maybe-const}@> && @\exposconcept{cartesian-product-common-arg}@<@\exposid{maybe-const}@>)); - template + template concept @\defexposconcept{cartesian-product-is-common}@ = // \expos - (@\exposconcept{cartesian-product-common-arg}@ && ...); + @\exposconcept{cartesian-product-common-arg}@; template concept @\defexposconcept{cartesian-product-is-sized}@ = // \expos @@ -14329,9 +14329,9 @@ constexpr @\exposid{iterator}@ end() requires ((!@\exposconcept{simple-view}@ || ... || !@\exposconcept{simple-view}@) && - @\exposconcept{cartesian-product-is-common}@); + @\exposconcept{cartesian-product-is-common}@); constexpr @\exposid{iterator}@ end() const - requires @\exposconcept{cartesian-product-is-common}@; + requires @\exposconcept{cartesian-product-is-common}@; constexpr default_sentinel_t end() const noexcept; constexpr @\seebelow@ size() @@ -14383,9 +14383,9 @@ \begin{itemdecl} constexpr @\exposid{iterator}@ end() requires ((!@\exposconcept{simple-view}@ || ... || !@\exposconcept{simple-view}@) - && @\exposconcept{cartesian-product-is-common}@); + && @\exposconcept{cartesian-product-is-common}@); constexpr @\exposid{iterator}@ end() const - requires @\exposconcept{cartesian-product-is-common}@; + requires @\exposconcept{cartesian-product-is-common}@; \end{itemdecl} \begin{itemdescr}