2014-06-27 Paolo Carlini <paolo.carlini@oracle.com>

	* Revert r212046 and r212054.

From-SVN: r212085

libstdc++-v3/ChangeLog

-2014-06-26  François Dumont  <fdumont@gcc.gnu.org>
-
-	* testsuite/util/testsuite_allocator.h
-	(tracker_allocator_counter::allocate): Remove new invocation, only
-	collect information.
-	(tracker_allocator_counter::deallocate): Remove delete invocation, only
-	collect information.
-	(check_inconsistent_alloc_value_type): New.
-	(tracker_allocator): Transform as a facade for any allocator type.
-	(uneq_allocator): Likewise.
-	(propagating_allocator): Likewise.
-	* testsuite/23_containers/forward_list/debug/move_assign_neg.cc: Use an
-	explicitly non propagating allocator.
-	* testsuite/23_containers/map/debug/move_assign_neg.cc: Likewise.
-	* testsuite/23_containers/multimap/debug/move_assign_neg.cc: likewise.
-	* testsuite/23_containers/multiset/debug/move_assign_neg.cc: Likewise.
-	* testsuite/23_containers/set/debug/move_assign_neg.cc: Likewise.
-	* testsuite/23_containers/unordered_map/debug/move_assign_neg.cc:
-	Likewise.
-	* testsuite/23_containers/unordered_multimap/debug/move_assign_neg.cc:
-	Likewise.
-	* testsuite/23_containers/unordered_multiset/debug/move_assign_neg.cc:
-	Likewise.
-	* testsuite/23_containers/unordered_set/debug/move_assign_neg.cc:
-	Likewise.
-	* testsuite/23_containers/vector/debug/move_assign_neg.cc: Likewise.
-
 2014-06-26  Jonathan Wakely  <jwakely@redhat.com>
 
 	* include/bits/shared_ptr_base.h (__shared_ptr::_Deleter): Fix

libstdc++-v3/testsuite/23_containers/forward_list/debug/move_assign_neg.cc

@@ -25,7 +25,7 @@ void test01()
 {
   bool test __attribute__((unused)) = true;
 
-  typedef __gnu_test::propagating_allocator<int, false> alloc_type;
+  typedef __gnu_test::uneq_allocator<int> alloc_type;
   typedef __gnu_debug::forward_list<int, alloc_type> test_type;
 
   test_type v1(alloc_type(1));

libstdc++-v3/testsuite/23_containers/map/debug/move_assign_neg.cc

@@ -25,8 +25,7 @@ void test01()
 {
   bool test __attribute__((unused)) = true;
 
-  typedef __gnu_test::propagating_allocator<std::pair<const int, int>,
-					    false> alloc_type;
+  typedef __gnu_test::uneq_allocator<std::pair<const int, int> > alloc_type;
   typedef __gnu_debug::map<int, int, std::less<int>, alloc_type> test_type;
 
   test_type v1(alloc_type(1));

libstdc++-v3/testsuite/23_containers/multimap/debug/move_assign_neg.cc

@@ -25,8 +25,7 @@ void test01()
 {
   bool test __attribute__((unused)) = true;
 
-  typedef __gnu_test::propagating_allocator<std::pair<const int, int>,
-					    false> alloc_type;
+  typedef __gnu_test::uneq_allocator<std::pair<const int, int> > alloc_type;
   typedef __gnu_debug::multimap<int, int, std::less<int>, alloc_type> test_type;
 
   test_type v1(alloc_type(1));

libstdc++-v3/testsuite/23_containers/multiset/debug/move_assign_neg.cc

@@ -25,7 +25,7 @@ void test01()
 {
   bool test __attribute__((unused)) = true;
 
-  typedef __gnu_test::propagating_allocator<int, false> alloc_type;
+  typedef __gnu_test::uneq_allocator<int> alloc_type;
   typedef __gnu_debug::multiset<int, std::less<int>, alloc_type> test_type;
 
   test_type v1(alloc_type(1));

libstdc++-v3/testsuite/23_containers/set/debug/move_assign_neg.cc

@@ -25,7 +25,7 @@ void test01()
 {
   bool test __attribute__((unused)) = true;
 
-  typedef __gnu_test::propagating_allocator<int, false> alloc_type;
+  typedef __gnu_test::uneq_allocator<int> alloc_type;
   typedef __gnu_debug::set<int, std::less<int>, alloc_type> test_type;
 
   test_type v1(alloc_type(1));

libstdc++-v3/testsuite/23_containers/unordered_map/debug/move_assign_neg.cc

@@ -25,8 +25,7 @@ void test01()
 {
   bool test __attribute__((unused)) = true;
 
-  typedef __gnu_test::propagating_allocator<std::pair<const int, int>,
-					    false> alloc_type;
+  typedef __gnu_test::uneq_allocator<std::pair<const int, int> > alloc_type;
   typedef __gnu_debug::unordered_map<int, int,
 				     std::hash<int>, std::equal_to<int>,
 				     alloc_type> test_type;

libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/move_assign_neg.cc

@@ -25,8 +25,7 @@ void test01()
 {
   bool test __attribute__((unused)) = true;
 
-  typedef __gnu_test::propagating_allocator<std::pair<const int, int>,
-					    false> alloc_type;
+  typedef __gnu_test::uneq_allocator<std::pair<const int, int>> alloc_type;
   typedef __gnu_debug::unordered_multimap<int, int, std::hash<int>,
 					  std::equal_to<int>,
 					  alloc_type> test_type;

libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/move_assign_neg.cc

@@ -25,7 +25,7 @@ void test01()
 {
   bool test __attribute__((unused)) = true;
 
-  typedef __gnu_test::propagating_allocator<int, false> alloc_type;
+  typedef __gnu_test::uneq_allocator<int> alloc_type;
   typedef __gnu_debug::unordered_multiset<int, std::hash<int>,
 					  std::equal_to<int>,
 					  alloc_type> test_type;

libstdc++-v3/testsuite/23_containers/unordered_set/debug/move_assign_neg.cc

@@ -25,7 +25,7 @@ void test01()
 {
   bool test __attribute__((unused)) = true;
 
-  typedef __gnu_test::propagating_allocator<int, false> alloc_type;
+  typedef __gnu_test::uneq_allocator<int> alloc_type;
   typedef __gnu_debug::unordered_set<int, std::hash<int>,
 				     std::equal_to<int>,
 				     alloc_type> test_type;

libstdc++-v3/testsuite/23_containers/vector/debug/move_assign_neg.cc

@@ -27,7 +27,7 @@ void test01()
 {
   bool test __attribute__((unused)) = true;
 
-  typedef __gnu_test::propagating_allocator<int, false> alloc_type;
+  typedef __gnu_test::uneq_allocator<int> alloc_type;
   typedef __gnu_debug::vector<int, alloc_type> test_type;
 
   test_type v1(alloc_type(1));