Repair the <tuple> part of C++20 p1032 Misc constexpr bits.

2019-11-16  Edward Smith-Rowland  <3dw4rd@verizon.net>

	Repair the <tuple> part of C++20 p1032 Misc constexpr bits.
	* include/bits/uses_allocator.h (__uses_alloc0::_Sink::operaror=)
	(__use_alloc(const _Alloc&)) : Constexpr.

From-SVN: r278373

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 2dc29596959221522a080394b026c2e201b230e3..48b5c9b27bea1bda45327a8486afdee1d2f967d1 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2019-11-16  Edward Smith-Rowland  <3dw4rd@verizon.net>
+
+       Repair the <tuple> part of C++20 p1032 Misc constexpr bits.
+       * include/bits/uses_allocator.h (__uses_alloc0::_Sink::operaror=)
+       (__use_alloc(const _Alloc&)) : Constexpr.
+
 2019-11-17  Jonathan Wakely  <jwakely@redhat.com>
 
        * include/std/string_view (basic_string_view(It, End)): Add range

diff --git a/libstdc++-v3/include/bits/uses_allocator.h b/libstdc++-v3/include/bits/uses_allocator.h
index 015828bee18d126e7cbff50182436bd9de6e5bf4..3e5d59f88bd68f916a0f8c14a83b7f60468c3be3 100644 (file)
--- a/libstdc++-v3/include/bits/uses_allocator.h
+++ b/libstdc++-v3/include/bits/uses_allocator.h
@@ -72,7 +72,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
 
   struct __uses_alloc0 : __uses_alloc_base
   {
-    struct _Sink { void operator=(const void*) { } } _M_a;
+    struct _Sink { void _GLIBCXX20_CONSTEXPR operator=(const void*) { } } _M_a;
   };
 
   template<typename _Alloc>
@@ -109,6 +109,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
       __uses_alloc<uses_allocator<_Tp, _Alloc>::value, _Tp, _Alloc, _Args...>;
 
   template<typename _Tp, typename _Alloc, typename... _Args>
+    _GLIBCXX20_CONSTEXPR
     inline __uses_alloc_t<_Tp, _Alloc, _Args...>
     __use_alloc(const _Alloc& __a)
     {