PR libstdc++/60499

	* include/debug/forward_list (forward_list::operator=(forward_list&&)):
	Uglify name.
	* include/debug/map (map::operator=(map&&)): Likewise.
	* include/debug/multimap (multimap::operator=(multimap&&)): Likewise.
	* include/debug/multiset (multiset::operator=(multiset&&)): Likewise.
	* include/debug/set (set::operator=(set&&)): Likewise.
	* include/debug/unordered_map
	(unordered_map::operator=(unordered_map&&)): Likewise.
	(unordered_multimap::operator=(unordered_multimap&&)): Likewise.
	* include/debug/unordered_set
	(unordered_set::operator=(unordered_set&&)): Likewise.
	(unordered_multiset::operator=(unordered_multiset&&)): Likewise.
	* include/debug/vector (vector::operator=(vector&&)): Likewise.
	* testsuite/23_containers/forward_list/debug/60499.cc: New
	* testsuite/23_containers/map/debug/60499.cc: New
	* testsuite/23_containers/multimap/debug/60499.cc: New
	* testsuite/23_containers/multiset/debug/60499.cc: New
	* testsuite/23_containers/set/debug/60499.cc: New
	* testsuite/23_containers/unordered_map/debug/60499.cc: New
	* testsuite/23_containers/unordered_multimap/debug/60499.cc: New
	* testsuite/23_containers/unordered_multiset/debug/60499.cc: New
	* testsuite/23_containers/unordered_set/debug/60499.cc: New
	* testsuite/23_containers/vector/debug/60499.cc: New

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@208490 138bc75d-0d04-0410-961f-82ee72b054a4

8 files changed, 20 insertions, 20 deletions

diff --git a/libstdc++-v3/include/debug/forward_list b/libstdc++-v3/include/debug/forward_list
index f2984c9c30c..12f6d7fbe1d 100644
--- a/libstdc++-v3/include/debug/forward_list
+++ b/libstdc++-v3/include/debug/forward_list
@@ -140,10 +140,10 @@ namespace __debug
       noexcept(_Node_alloc_traits::_S_nothrow_move())
       {
 	__glibcxx_check_self_move_assign(__list);
-	bool xfer_memory = _Node_alloc_traits::_S_propagate_on_move_assign()
+	bool __xfer_memory = _Node_alloc_traits::_S_propagate_on_move_assign()
 	    || __list.get_allocator() == this->get_allocator();
 	static_cast<_Base&>(*this) = std::move(__list);
-	if (xfer_memory)
+	if (__xfer_memory)
 	  this->_M_swap(__list);
 	else
 	  this->_M_invalidate_all();
diff --git a/libstdc++-v3/include/debug/map.h b/libstdc++-v3/include/debug/map.h
index bd68c996d0d..fda6ac1eee5 100644
--- a/libstdc++-v3/include/debug/map.h
+++ b/libstdc++-v3/include/debug/map.h
@@ -148,10 +148,10 @@ namespace __debug
       noexcept(_Alloc_traits::_S_nothrow_move())
       {
 	__glibcxx_check_self_move_assign(__x);
-	bool xfer_memory = _Alloc_traits::_S_propagate_on_move_assign()
+	bool __xfer_memory = _Alloc_traits::_S_propagate_on_move_assign()
 	    || __x.get_allocator() == this->get_allocator();
 	_M_base() = std::move(__x._M_base());
-	if (xfer_memory)
+	if (__xfer_memory)
 	  this->_M_swap(__x);
 	else
 	  this->_M_invalidate_all();
diff --git a/libstdc++-v3/include/debug/multimap.h b/libstdc++-v3/include/debug/multimap.h
index fad80cc8ebe..4c3a3eb8747 100644
--- a/libstdc++-v3/include/debug/multimap.h
+++ b/libstdc++-v3/include/debug/multimap.h
@@ -150,10 +150,10 @@ namespace __debug
       noexcept(_Alloc_traits::_S_nothrow_move())
       {
 	__glibcxx_check_self_move_assign(__x);
-	bool xfer_memory = _Alloc_traits::_S_propagate_on_move_assign()
+	bool __xfer_memory = _Alloc_traits::_S_propagate_on_move_assign()
 	    || __x.get_allocator() == this->get_allocator();
 	_M_base() = std::move(__x._M_base());
-	if (xfer_memory)
+	if (__xfer_memory)
 	  this->_M_swap(__x);
 	else
 	  this->_M_invalidate_all();
diff --git a/libstdc++-v3/include/debug/multiset.h b/libstdc++-v3/include/debug/multiset.h
index bd555b3c290..ae62bf87214 100644
--- a/libstdc++-v3/include/debug/multiset.h
+++ b/libstdc++-v3/include/debug/multiset.h
@@ -149,10 +149,10 @@ namespace __debug
       noexcept(_Alloc_traits::_S_nothrow_move())
       {
 	__glibcxx_check_self_move_assign(__x);
-	bool xfer_memory = _Alloc_traits::_S_propagate_on_move_assign()
+	bool __xfer_memory = _Alloc_traits::_S_propagate_on_move_assign()
 	    || __x.get_allocator() == this->get_allocator();
 	_M_base() = std::move(__x._M_base());
-	if (xfer_memory)
+	if (__xfer_memory)
 	  this->_M_swap(__x);
 	else
 	  this->_M_invalidate_all();
diff --git a/libstdc++-v3/include/debug/set.h b/libstdc++-v3/include/debug/set.h
index f40ecec818f..c83e2afa96c 100644
--- a/libstdc++-v3/include/debug/set.h
+++ b/libstdc++-v3/include/debug/set.h
@@ -148,10 +148,10 @@ namespace __debug
       noexcept(_Alloc_traits::_S_nothrow_move())
       {
 	__glibcxx_check_self_move_assign(__x);
-	bool xfer_memory = _Alloc_traits::_S_propagate_on_move_assign()
+	bool __xfer_memory = _Alloc_traits::_S_propagate_on_move_assign()
 	    || __x.get_allocator() == this->get_allocator();
 	_M_base() = std::move(__x._M_base());
-	if (xfer_memory)
+	if (__xfer_memory)
 	  this->_M_swap(__x);
 	else
 	  this->_M_invalidate_all();
diff --git a/libstdc++-v3/include/debug/unordered_map b/libstdc++-v3/include/debug/unordered_map
index 821bf0bfe81..626beba5f46 100644
--- a/libstdc++-v3/include/debug/unordered_map
+++ b/libstdc++-v3/include/debug/unordered_map
@@ -143,10 +143,10 @@ namespace __debug
       noexcept(_Alloc_traits::_S_nothrow_move())
       {
 	__glibcxx_check_self_move_assign(__x);
-	bool xfer_memory = _Alloc_traits::_S_propagate_on_move_assign()
+	bool __xfer_memory = _Alloc_traits::_S_propagate_on_move_assign()
 	    || __x.get_allocator() == this->get_allocator();
 	_M_base() = std::move(__x._M_base());	
-	if (xfer_memory)
+	if (__xfer_memory)
 	  this->_M_swap(__x);
 	else
 	  this->_M_invalidate_all();
@@ -599,10 +599,10 @@ namespace __debug
       noexcept(_Alloc_traits::_S_nothrow_move())
       {
 	__glibcxx_check_self_move_assign(__x);
-	bool xfer_memory = _Alloc_traits::_S_propagate_on_move_assign()
+	bool __xfer_memory = _Alloc_traits::_S_propagate_on_move_assign()
 	    || __x.get_allocator() == this->get_allocator();
 	_M_base() = std::move(__x._M_base());
-	if (xfer_memory)
+	if (__xfer_memory)
 	  this->_M_swap(__x);
 	else
 	  this->_M_invalidate_all();
diff --git a/libstdc++-v3/include/debug/unordered_set b/libstdc++-v3/include/debug/unordered_set
index 3bc3fab5610..a17efd0a5fe 100644
--- a/libstdc++-v3/include/debug/unordered_set
+++ b/libstdc++-v3/include/debug/unordered_set
@@ -142,10 +142,10 @@ namespace __debug
       noexcept(_Alloc_traits::_S_nothrow_move())
       {
 	__glibcxx_check_self_move_assign(__x);
-	bool xfer_memory = _Alloc_traits::_S_propagate_on_move_assign()
+	bool __xfer_memory = _Alloc_traits::_S_propagate_on_move_assign()
 	    || __x.get_allocator() == this->get_allocator();
 	_M_base() = std::move(__x._M_base());
-	if (xfer_memory)
+	if (__xfer_memory)
 	  this->_M_swap(__x);
 	else
 	  this->_M_invalidate_all();
@@ -593,10 +593,10 @@ namespace __debug
       noexcept(_Alloc_traits::_S_nothrow_move())
       {
 	__glibcxx_check_self_move_assign(__x);
-	bool xfer_memory = _Alloc_traits::_S_propagate_on_move_assign()
+	bool __xfer_memory = _Alloc_traits::_S_propagate_on_move_assign()
 	    || __x.get_allocator() == this->get_allocator();
 	_M_base() = std::move(__x._M_base());
-	if (xfer_memory)
+	if (__xfer_memory)
 	  this->_M_swap(__x);
 	else
 	  this->_M_invalidate_all();
diff --git a/libstdc++-v3/include/debug/vector b/libstdc++-v3/include/debug/vector
index 58d98ef5de5..bcca52035d3 100644
--- a/libstdc++-v3/include/debug/vector
+++ b/libstdc++-v3/include/debug/vector
@@ -163,10 +163,10 @@ namespace __debug
       operator=(vector&& __x) noexcept(_Alloc_traits::_S_nothrow_move())
       {
 	__glibcxx_check_self_move_assign(__x);
-	bool xfer_memory = _Alloc_traits::_S_propagate_on_move_assign()
+	bool __xfer_memory = _Alloc_traits::_S_propagate_on_move_assign()
 	    || __x.get_allocator() == this->get_allocator();
 	_M_base() = std::move(__x._M_base());
-	if (xfer_memory)
+	if (__xfer_memory)
 	  this->_M_swap(__x);
 	else
 	  this->_M_invalidate_all();