Re: [PATCH] libstdc++: Apply proposed resolutions for LWG 3428, 3447

2020-10-22 Thread Jonathan Wakely via Gcc-patches 

On 22/10/20 11:05 -0400, Patrick Palka via Libstdc++ wrote:

Tested on x86_64-pc-linux-gnu.  Does this look OK for trunk and the 10
branch?


Yes for both, thanks.


libstdc++-v3/ChangeLog:

* include/std/ranges (single_view::single_view): Mark the
in place constructor explicit as per LWG 3428.
(take_view): Remove the constraint on the deduction guide's
template parameter as per LWG 3447.
---
libstdc++-v3/include/std/ranges | 9 +++--
1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/libstdc++-v3/include/std/ranges b/libstdc++-v3/include/std/ranges
index 4d3a4940c6f..a3e5354848a 100644
--- a/libstdc++-v3/include/std/ranges
+++ b/libstdc++-v3/include/std/ranges
@@ -205,9 +205,11 @@ namespace ranges
  : _M_value(std::move(__t))
  { }

+  // _GLIBCXX_RESOLVE_LIB_DEFECTS
+  // 3428. single_view's in place constructor should be explicit
  template
requires constructible_from<_Tp, _Args...>
-   constexpr
+   constexpr explicit
single_view(in_place_t, _Args&&... __args)
: _M_value{in_place, std::forward<_Args>(__args)...}
{ }
@@ -1801,7 +1803,10 @@ namespace views
  }
};

-  template
+  // _GLIBCXX_RESOLVE_LIB_DEFECTS
+  // 3447. Deduction guides for take_view and drop_view have different
+  // constraints
+  template
take_view(_Range&&, range_difference_t<_Range>)
  -> take_view>;

--
2.29.0.rc0

[PATCH] libstdc++: Apply proposed resolutions for LWG 3428, 3447

2020-10-22 Thread Patrick Palka via Gcc-patches 
Tested on x86_64-pc-linux-gnu.  Does this look OK for trunk and the 10
branch?

libstdc++-v3/ChangeLog:

* include/std/ranges (single_view::single_view): Mark the
in place constructor explicit as per LWG 3428.
(take_view): Remove the constraint on the deduction guide's
template parameter as per LWG 3447.
---
 libstdc++-v3/include/std/ranges | 9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/libstdc++-v3/include/std/ranges b/libstdc++-v3/include/std/ranges
index 4d3a4940c6f..a3e5354848a 100644
--- a/libstdc++-v3/include/std/ranges
+++ b/libstdc++-v3/include/std/ranges
@@ -205,9 +205,11 @@ namespace ranges
   : _M_value(std::move(__t))
   { }
 
+  // _GLIBCXX_RESOLVE_LIB_DEFECTS
+  // 3428. single_view's in place constructor should be explicit
   template
requires constructible_from<_Tp, _Args...>
-   constexpr
+   constexpr explicit
single_view(in_place_t, _Args&&... __args)
: _M_value{in_place, std::forward<_Args>(__args)...}
{ }
@@ -1801,7 +1803,10 @@ namespace views
   }
 };
 
-  template
+  // _GLIBCXX_RESOLVE_LIB_DEFECTS
+  // 3447. Deduction guides for take_view and drop_view have different
+  // constraints
+  template
 take_view(_Range&&, range_difference_t<_Range>)
   -> take_view>;
 
-- 
2.29.0.rc0