diff options
| author | Edward Smith-Rowland <3dw4rd@verizon.net> | 2019-11-17 03:31:15 +0000 |
|---|---|---|
| committer | Edward Smith-Rowland <emsr@gcc.gnu.org> | 2019-11-17 03:31:15 +0000 |
| commit | f6e86b330363306d772ed69dfb864532bf5de5b6 (patch) | |
| tree | d3e4caba21c44fbf9e20d9de73a6042a4ce79233 | |
| parent | 8857080c81761eb1344c3b5404b5e25e9cc949eb (diff) | |
| download | gcc-f6e86b330363306d772ed69dfb864532bf5de5b6.zip gcc-f6e86b330363306d772ed69dfb864532bf5de5b6.tar.gz gcc-f6e86b330363306d772ed69dfb864532bf5de5b6.tar.bz2 | |
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
| -rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/uses_allocator.h | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 2dc2959..48b5c9b 100644 --- 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 015828b..3e5d59f 100644 --- 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) { |