Licensing changes to GPLv3 resp. GPLv3 with GCC Runtime Exception.

[pf3gnuchains/gcc-fork.git] / libstdc++-v3 / testsuite / ext / mt_allocator / tune-2.cc

diff --git a/libstdc++-v3/testsuite/ext/mt_allocator/tune-2.cc b/libstdc++-v3/testsuite/ext/mt_allocator/tune-2.cc
index 1dcf084..c3f6b3b 100644 (file)
--- a/libstdc++-v3/testsuite/ext/mt_allocator/tune-2.cc
+++ b/libstdc++-v3/testsuite/ext/mt_allocator/tune-2.cc
@@ -1,11 +1,11 @@
 // 2004-08-25 Benjamin Kosnik <bkoz@redhat.com>
 //
-// Copyright (C) 2004 Free Software Foundation, Inc.
+// Copyright (C) 2004, 2005, 2009 Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
 // terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
+// Free Software Foundation; either version 3, or (at your option)
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
@@ -14,13 +14,19 @@
 // GNU General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
+// with this library; see the file COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
 
-#include <testsuite_hooks.h>
 #include <memory>
 #include <ext/mt_allocator.h>
+#include <testsuite_hooks.h>
+#include <testsuite_character.h>
+
+#ifdef __GTHREADS
+#define __cxxthread true
+#else
+#define __cxxthread false
+#endif
 
 // Tune characteristics. 
 // __per_type_pool_policy
@@ -29,19 +35,19 @@ void test02()
   bool test __attribute__((unused)) = true;
 
   typedef __gnu_test::pod_int value_type;
-#ifdef __GTHREADS
-  typedef __gnu_cxx::__per_type_pool_policy<value_type, true> policy_type;
-#else
-  typedef __gnu_cxx::__per_type_pool_policy<value_type, false> policy_type;
-#endif
+
+  using __gnu_cxx::__pool;
+  using __gnu_cxx::__per_type_pool_policy;
+
+  typedef __per_type_pool_policy<value_type, __pool, __cxxthread> policy_type;
   typedef __gnu_cxx::__mt_alloc<value_type, policy_type> allocator_type;
   typedef __gnu_cxx::__pool_base::_Tune tune_type;
 
-  tune_type t_opt(16, 5120, 32, 5120, 20, 10, false);
-  tune_type t_single(16, 5120, 32, 5120, 1, 10, false);
-
   allocator_type a;
   tune_type t_default = a._M_get_options();
+  tune_type t_opt(32, 5120, 32, 5120, 20, 10, false);
+  tune_type t_small(16, 1024, 32, 2048, 1, 10, false);
+
   tune_type t1 = t_default; 
   a._M_set_options(t_opt);
   tune_type t2 = a._M_get_options();
@@ -49,10 +55,10 @@ void test02()
 
   allocator_type::pointer p1 = a.allocate(128);
   allocator_type::pointer p2 = a.allocate(5128);
-  a._M_set_options(t_single);
-  t1 = a._M_get_options();  
-  VERIFY( t1._M_max_threads != t_single._M_max_threads );
-  VERIFY( t1._M_max_threads == t_opt._M_max_threads );
+  a._M_set_options(t_small);
+  tune_type t3 = a._M_get_options();  
+  VERIFY( t3._M_chunk_size != t_small._M_chunk_size );
+  VERIFY( t3._M_chunk_size == t_opt._M_chunk_size );
 
   a.deallocate(p1, 128);
   a.deallocate(p2, 5128);