diff mbox

Simplify allocator use

Message ID 20140625230602.GF2711@redhat.com
State New
Headers show

Commit Message

Jonathan Wakely June 25, 2014, 11:06 p.m. UTC 
This simplifies some of the test changes in my last patch, I was
misusing the CustomPointerAlloc due to confusion with some uncommitted
changes.

Tested x86_64-linux, committed to trunk.
diff mbox

Patch

commit d1a05535e99bfecb427829d3e03ef82e0977e60c
Author: Jonathan Wakely <jwakely@redhat.com>
Date:   Wed Jun 25 23:39:20 2014 +0100

    	* testsuite/20_util/shared_ptr/creation/alloc.cc: Fix use of test
    	allocator.
    	* testsuite/20_util/shared_ptr/creation/no_rtti.cc: Likewise.
    	* testsuite/30_threads/promise/cons/alloc.cc: Likewise.

diff --git a/libstdc++-v3/testsuite/20_util/shared_ptr/creation/alloc.cc b/libstdc++-v3/testsuite/20_util/shared_ptr/creation/alloc.cc
index 402c612..0628807 100644
--- a/libstdc++-v3/testsuite/20_util/shared_ptr/creation/alloc.cc
+++ b/libstdc++-v3/testsuite/20_util/shared_ptr/creation/alloc.cc
@@ -101,16 +101,10 @@  test02()
 	  == tracker_allocator_counter::get_deallocation_count() );
 }
 
-template<typename T>
-  struct Pointer : __gnu_test::PointerBase<Pointer<T>, T>
-  {
-    using __gnu_test::PointerBase<Pointer<T>, T>::PointerBase;
-  };
-
 void
 test03()
 {
-  __gnu_test::CustomPointerAlloc<Pointer<int>> alloc;
+  __gnu_test::CustomPointerAlloc<int> alloc;
   auto p = std::allocate_shared<int>(alloc, 1);
   VERIFY( *p == 1 );
 }
diff --git a/libstdc++-v3/testsuite/20_util/shared_ptr/creation/no_rtti.cc b/libstdc++-v3/testsuite/20_util/shared_ptr/creation/no_rtti.cc
index 127bafb..d1fab6c 100644
--- a/libstdc++-v3/testsuite/20_util/shared_ptr/creation/no_rtti.cc
+++ b/libstdc++-v3/testsuite/20_util/shared_ptr/creation/no_rtti.cc
@@ -29,13 +29,7 @@  struct X { };
 
 // test allocate_shared with no RTTI
 
-template<typename T>
-  struct Pointer : __gnu_test::PointerBase<Pointer<T>, T>
-  {
-    using __gnu_test::PointerBase<Pointer<T>, T>::PointerBase;
-  };
-
-__gnu_test::CustomPointerAlloc<Pointer<int>> alloc;
+__gnu_test::CustomPointerAlloc<int> alloc;
 
 auto p = std::allocate_shared<X>(alloc);
 
diff --git a/libstdc++-v3/testsuite/30_threads/promise/cons/alloc.cc b/libstdc++-v3/testsuite/30_threads/promise/cons/alloc.cc
index c45e646..ea9bb1a 100644
--- a/libstdc++-v3/testsuite/30_threads/promise/cons/alloc.cc
+++ b/libstdc++-v3/testsuite/30_threads/promise/cons/alloc.cc
@@ -38,16 +38,9 @@  void test01()
   VERIFY( p1.get_future().get() == 5 );
 }
 
-template<typename T>
-  struct Pointer : __gnu_test::PointerBase<Pointer<T>, T>
-  {
-    using __gnu_test::PointerBase<Pointer<T>, T>::PointerBase;
-  };
-
-void
-test02()
+void test02()
 {
-  __gnu_test::CustomPointerAlloc<Pointer<int>> alloc;
+  __gnu_test::CustomPointerAlloc<int> alloc;
   promise<int> p1(allocator_arg, alloc);
   p1.set_value(5);
   VERIFY( p1.get_future().get() == 5 );