From 9aa2470ab2c98bdd276c2682a96e5a4bdfcdbb48 Mon Sep 17 00:00:00 2001
From: Marc Glisse <marc.glisse@inria.fr>
Date: Tue, 5 Feb 2019 10:33:36 +0100
Subject: [PATCH] Rename __is_trivially_relocatable to
 __is_bitwise_relocatable.

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.

From-SVN: r268532
---
 libstdc++-v3/ChangeLog                        | 10 ++++++++++
 libstdc++-v3/include/bits/stl_deque.h         |  4 ++--
 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 36fcab95d7b..a3c0002d8bd 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 1574895a2c6..5c86efc0db2 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 664e4ad8f00..03ed16b8c1a 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
     {
-- 
2.11.4.GIT