diff options
| -rw-r--r-- | libstdc++-v3/ChangeLog | 10 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/stl_deque.h | 4 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/stl_uninitialized.h | 5 |
3 files changed, 15 insertions, 4 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 36fcab9..a3c0002 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,13 @@ +2019-02-05 Marc Glisse <marc.glisse@inria.fr> + + PR libstdc++/87106 + * include/bits/stl_uninitialized.h (__is_trivially_relocatable): + Rename... + (__is_bitwise_relocatable): ... to this. + (__relocate_a_1): Adapt. + * include/bits/stl_deque.h (__is_trivially_relocatable): Rename... + (__is_bitwise_relocatable): ... to this. + 2019-01-30 Jonathan Wakely <jwakely@redhat.com> PR libstdc++/89117 diff --git a/libstdc++-v3/include/bits/stl_deque.h b/libstdc++-v3/include/bits/stl_deque.h index 1574895..5c86efc 100644 --- a/libstdc++-v3/include/bits/stl_deque.h +++ b/libstdc++-v3/include/bits/stl_deque.h @@ -61,7 +61,7 @@ #include <bits/stl_iterator_base_funcs.h> #if __cplusplus >= 201103L #include <initializer_list> -#include <bits/stl_uninitialized.h> // for __is_trivially_relocatable +#include <bits/stl_uninitialized.h> // for __is_bitwise_relocatable #endif #include <debug/assertions.h> @@ -2372,7 +2372,7 @@ _GLIBCXX_END_NAMESPACE_CONTAINER // std::allocator is safe, but it is not the only allocator // for which this is valid. template<class _Tp> - struct __is_trivially_relocatable<_GLIBCXX_STD_C::deque<_Tp>> + struct __is_bitwise_relocatable<_GLIBCXX_STD_C::deque<_Tp>> : true_type { }; #endif diff --git a/libstdc++-v3/include/bits/stl_uninitialized.h b/libstdc++-v3/include/bits/stl_uninitialized.h index 664e4ad..03ed16b 100644 --- a/libstdc++-v3/include/bits/stl_uninitialized.h +++ b/libstdc++-v3/include/bits/stl_uninitialized.h @@ -896,12 +896,13 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION } // This class may be specialized for specific types. + // Also known as is_trivially_relocatable. template<typename _Tp, typename = void> - struct __is_trivially_relocatable + struct __is_bitwise_relocatable : is_trivial<_Tp> { }; template <typename _Tp, typename _Up> - inline __enable_if_t<std::__is_trivially_relocatable<_Tp>::value, _Tp*> + inline __enable_if_t<std::__is_bitwise_relocatable<_Tp>::value, _Tp*> __relocate_a_1(_Tp* __first, _Tp* __last, _Tp* __result, allocator<_Up>& __alloc) noexcept { |