*: Change namespace pb_ds to __gnu_pbds.

2007-09-12  Benjamin Kosnik  <bkoz@redhat.com>

	* include/ext/pb_ds/*: Change namespace pb_ds to __gnu_pbds.
	* docs/html/ext/pb_ds/*: Same.
	* testsuite/ext/pb_ds/*: Same.
	* testsuite/performance/ext/pb_ds/*: Same.
	* testsuite/util/*: Same.

From-SVN: r128448

21 files changed, 110 insertions, 110 deletions

diff --git a/libstdc++-v3/testsuite/util/performance/assoc/mem_usage/erase_test.hpp b/libstdc++-v3/testsuite/util/performance/assoc/mem_usage/erase_test.hpp
index 3d2804e81f5..722811aac51 100644
--- a/libstdc++-v3/testsuite/util/performance/assoc/mem_usage/erase_test.hpp
+++ b/libstdc++-v3/testsuite/util/performance/assoc/mem_usage/erase_test.hpp
@@ -53,7 +53,7 @@
 #include <performance/io/xml_formatter.hpp>
 #include <common_type/assoc/string_form.hpp>
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace test
   {
@@ -113,7 +113,7 @@ namespace pb_ds
 	}
     }
   } // namespace test
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif
 
diff --git a/libstdc++-v3/testsuite/util/performance/assoc/mem_usage/multimap_insert_test.hpp b/libstdc++-v3/testsuite/util/performance/assoc/mem_usage/multimap_insert_test.hpp
index 1fb4eef9003..22300bb5b86 100644
--- a/libstdc++-v3/testsuite/util/performance/assoc/mem_usage/multimap_insert_test.hpp
+++ b/libstdc++-v3/testsuite/util/performance/assoc/mem_usage/multimap_insert_test.hpp
@@ -53,7 +53,7 @@
 #include <performance/io/xml_formatter.hpp>
 #include <common_type/assoc/string_form.hpp>
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace test
   {
@@ -74,11 +74,11 @@ namespace pb_ds
 
       template<typename Cntnr>
       size_t
-      insert(Cntnr, It ins_it_b, It ins_it_e, pb_ds::detail::true_type);
+      insert(Cntnr, It ins_it_b, It ins_it_e, __gnu_pbds::detail::true_type);
 
       template<typename Cntnr>
       size_t
-      insert(Cntnr, It ins_it_b, It ins_it_e, pb_ds::detail::false_type);
+      insert(Cntnr, It ins_it_b, It ins_it_e, __gnu_pbds::detail::false_type);
 
       const It m_ins_b;
       const size_t m_ins_vn;
@@ -104,7 +104,7 @@ namespace pb_ds
 	  std::advance(ins_it_e, ins_size);
 
 	  const size_t delta_mem = insert(Cntnr(), ins_it_b, ins_it_e,
-					  pb_ds::detail::integral_constant<int,Native>());
+					  __gnu_pbds::detail::integral_constant<int,Native>());
 
 	  res_set_fmt.add_res(ins_size, static_cast<double>(delta_mem));
 	}
@@ -114,7 +114,7 @@ namespace pb_ds
     template<typename Cntnr>
     size_t
     multimap_insert_test<It, Native>::
-    insert(Cntnr, It ins_it_b, It ins_it_e, pb_ds::detail::true_type)
+    insert(Cntnr, It ins_it_b, It ins_it_e, __gnu_pbds::detail::true_type)
     {
       typedef __gnu_test::tracker_allocator_counter counter_type;
       __gnu_test::tracker_allocator<char> alloc;
@@ -133,7 +133,7 @@ namespace pb_ds
     template<typename Cntnr>
     size_t
     multimap_insert_test<It, Native>::
-    insert(Cntnr, It ins_it_b, It ins_it_e, pb_ds::detail::false_type)
+    insert(Cntnr, It ins_it_b, It ins_it_e, __gnu_pbds::detail::false_type)
     {
       typedef __gnu_test::tracker_allocator_counter counter_type;
       __gnu_test::tracker_allocator<char> alloc;
@@ -148,7 +148,7 @@ namespace pb_ds
       return (final_mem - init_mem);
     }
   } // namespace test
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif 
 
diff --git a/libstdc++-v3/testsuite/util/performance/assoc/multimap_common_type.hpp b/libstdc++-v3/testsuite/util/performance/assoc/multimap_common_type.hpp
index e0bb1e95d73..2d386ff2645 100644
--- a/libstdc++-v3/testsuite/util/performance/assoc/multimap_common_type.hpp
+++ b/libstdc++-v3/testsuite/util/performance/assoc/multimap_common_type.hpp
@@ -50,7 +50,7 @@
 #include <hash_fn/string_hash_fn.hpp>
 #include <common_type/assoc/common_type.hpp>
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace test
   {
@@ -67,9 +67,9 @@ namespace pb_ds
       struct hash_set_tl_t
       {
 	typedef
-        typename pb_ds::test::hash_common_types<
+        typename __gnu_pbds::test::hash_common_types<
 	  Key,
-	  pb_ds::null_mapped_type,
+	  __gnu_pbds::null_mapped_type,
 	  int_hash,
 	  std::equal_to<Key>,
 	  Allocator>::performance_min_tl
@@ -80,9 +80,9 @@ namespace pb_ds
       struct lu_set_tl_t
       {
 	typedef
-        typename pb_ds::test::lu_common_types<
+        typename __gnu_pbds::test::lu_common_types<
 	  Key,
-	  pb_ds::null_mapped_type,
+	  __gnu_pbds::null_mapped_type,
 	  std::equal_to<
 	  Key>,
 	  Allocator>::performance_min_tl
@@ -96,8 +96,8 @@ namespace pb_ds
       {
       private:
 	typedef
-        typename pb_ds::detail::__conditional_type<
-	pb_ds::detail::is_same<
+        typename __gnu_pbds::detail::__conditional_type<
+	__gnu_pbds::detail::is_same<
 	int,
 	Key>::value,
 	int_hash,
@@ -108,7 +108,7 @@ namespace pb_ds
 	struct hash_mmap_transform
 	{
 	  typedef
-	  typename pb_ds::test::hash_common_types<
+	  typename __gnu_pbds::test::hash_common_types<
 	    Key,
 	    Cntnr_T,
 	    hash_fn_t,
@@ -137,12 +137,12 @@ namespace pb_ds
 	struct tree_mmap_transform
 	{
 	  typedef
-	  typename pb_ds::test::tree_common_types<
+	  typename __gnu_pbds::test::tree_common_types<
 	    Key,
 	    Cntnr_T,
 	    std::less<
 	    Key>,
-	    pb_ds::null_tree_node_update,
+	    __gnu_pbds::null_tree_node_update,
 	    Allocator>::performance_min_tl
 	  type;
 	};
@@ -227,7 +227,7 @@ namespace pb_ds
     };
 
   } // namespace test
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif
 
diff --git a/libstdc++-v3/testsuite/util/performance/assoc/timing/common_type.hpp b/libstdc++-v3/testsuite/util/performance/assoc/timing/common_type.hpp
index be4a31b3bdc..72cdf115cbc 100644
--- a/libstdc++-v3/testsuite/util/performance/assoc/timing/common_type.hpp
+++ b/libstdc++-v3/testsuite/util/performance/assoc/timing/common_type.hpp
@@ -49,25 +49,25 @@
 
 #include <common_type/assoc/common_type.hpp>
 
-namespace pb_ds
+namespace __gnu_pbds
 {
 
   namespace test
   {
 
     typedef
-    pb_ds::test::hash_common_types<
+    __gnu_pbds::test::hash_common_types<
       int,
-      pb_ds::null_mapped_type>::tl
+      __gnu_pbds::null_mapped_type>::tl
     hash_set_tl_t;
 
     template<typename Cntnr_T>
     struct hash_mmap_transform
     {
       typedef
-      typename pb_ds::test::hash_common_types<
+      typename __gnu_pbds::test::hash_common_types<
 	int,
-	pb_ds::compound_data_type<
+	__gnu_pbds::compound_data_type<
 	Cntnr_T> >::tl
       type;
     };
@@ -80,18 +80,18 @@ namespace pb_ds
     hash_mmap_tl_t;
 
     typedef
-    pb_ds::test::tree_common_types<
+    __gnu_pbds::test::tree_common_types<
       int,
-      pb_ds::null_mapped_type>::tl
+      __gnu_pbds::null_mapped_type>::tl
     tree_set_tl_t;
 
     template<typename Cntnr_T>
     struct tree_mmap_transform
     {
       typedef
-      typename pb_ds::test::tree_common_types<
+      typename __gnu_pbds::test::tree_common_types<
 	int,
-	pb_ds::compound_data_type<
+	__gnu_pbds::compound_data_type<
 	Cntnr_T> >::tl
       type;
     };
@@ -107,7 +107,7 @@ namespace pb_ds
 
   } // namespace test
 
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif // #ifndef PB_DS_MULTIMAP_RANDOM_INT_INSERT_TEST_COMMON_TYPE_HPP
 
diff --git a/libstdc++-v3/testsuite/util/performance/assoc/timing/find_test.hpp b/libstdc++-v3/testsuite/util/performance/assoc/timing/find_test.hpp
index bffac262247..d9ec7fb1572 100644
--- a/libstdc++-v3/testsuite/util/performance/assoc/timing/find_test.hpp
+++ b/libstdc++-v3/testsuite/util/performance/assoc/timing/find_test.hpp
@@ -52,7 +52,7 @@
 #include <common_type/assoc/string_form.hpp>
 #include <iterator>
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace test
   {
@@ -111,7 +111,7 @@ namespace pb_ds
     } // namespace detail
 
     template<typename It, bool LOR = false>
-    class find_test : private pb_ds::test::detail::timing_test_base
+    class find_test : private __gnu_pbds::test::detail::timing_test_base
     {
     public:
       find_test(It ins_b, It fnd_it_b, size_t ins_vn, size_t ins_vs, 
@@ -161,16 +161,16 @@ namespace pb_ds
 	  It fnd_it_e = m_fnd_it_b;
 	  std::advance(fnd_it_e, fnd_size);
 
-	  pb_ds::test::detail::find_find_functor<It, Cntnr, LOR>
+	  __gnu_pbds::test::detail::find_find_functor<It, Cntnr, LOR>
             fn(test_container, fnd_it_b, fnd_it_e);
 
 	  const double res =
-            pb_ds::test::detail::timing_test_base::operator()(fn);
+            __gnu_pbds::test::detail::timing_test_base::operator()(fn);
 	  res_set_fmt.add_res(v, res / fnd_size);
 	}
     }
   } // namespace test
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif 
 
diff --git a/libstdc++-v3/testsuite/util/performance/assoc/timing/insert_test.hpp b/libstdc++-v3/testsuite/util/performance/assoc/timing/insert_test.hpp
index c1ff8eb064a..b4dfa29b8cf 100644
--- a/libstdc++-v3/testsuite/util/performance/assoc/timing/insert_test.hpp
+++ b/libstdc++-v3/testsuite/util/performance/assoc/timing/insert_test.hpp
@@ -53,7 +53,7 @@
 #include <common_type/assoc/string_form.hpp>
 #include <iterator>
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace test
   {
@@ -85,7 +85,7 @@ namespace pb_ds
     } // namespace detail
 
     template<typename It>
-    class insert_test : private pb_ds::test::detail::timing_test_base
+    class insert_test : private __gnu_pbds::test::detail::timing_test_base
     {
     public:
       insert_test(It ins_b, size_t ins_vn, size_t ins_vs, size_t ins_vm)
@@ -126,11 +126,11 @@ namespace pb_ds
 	  It ins_it_e = m_ins_b;
 	  std::advance(ins_it_e, v);
 
-	  pb_ds::test::detail::insert_insert_functor<It, Cntnr>
+	  __gnu_pbds::test::detail::insert_insert_functor<It, Cntnr>
             fn(ins_it_b, ins_it_e);
 
 	  const double res =
-            pb_ds::test::detail::timing_test_base::operator()(fn);
+            __gnu_pbds::test::detail::timing_test_base::operator()(fn);
 
 	  res_set_fmt.add_res(v, res / v);
 	}
@@ -147,7 +147,7 @@ namespace pb_ds
         cntnr.insert((typename Cntnr::const_reference)(*ins_it));
     }
   } // namespace test
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif
 
diff --git a/libstdc++-v3/testsuite/util/performance/assoc/timing/multimap_find_test.hpp b/libstdc++-v3/testsuite/util/performance/assoc/timing/multimap_find_test.hpp
index 019a32d2a23..efd5997bf54 100644
--- a/libstdc++-v3/testsuite/util/performance/assoc/timing/multimap_find_test.hpp
+++ b/libstdc++-v3/testsuite/util/performance/assoc/timing/multimap_find_test.hpp
@@ -52,7 +52,7 @@
 #include <common_type/assoc/string_form.hpp>
 #include <iterator>
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace test
   {
@@ -128,7 +128,7 @@ namespace pb_ds
 
 
     template<typename It, bool Native>
-    class multimap_find_test : private pb_ds::test::detail::timing_test_base
+    class multimap_find_test : private __gnu_pbds::test::detail::timing_test_base
     {
     public:
       multimap_find_test(It ins_b, size_t ins_vn, size_t vs, size_t ins_vm)
@@ -144,12 +144,12 @@ namespace pb_ds
 
       template<typename Cntnr>
       Cntnr
-      init(It ins_b, It ins_e, Cntnr, pb_ds::detail::true_type)
+      init(It ins_b, It ins_e, Cntnr, __gnu_pbds::detail::true_type)
       { return Cntnr(ins_b, ins_e); }
 
       template<typename Cntnr>
       Cntnr
-      init(It ins_b, It ins_e, Cntnr, pb_ds::detail::false_type)
+      init(It ins_b, It ins_e, Cntnr, __gnu_pbds::detail::false_type)
       {
 	Cntnr ret;
 	for (It it = ins_b; it != ins_e; ++it)
@@ -182,19 +182,19 @@ namespace pb_ds
 	  std::advance(ins_it_e, v);
 
 	  Cntnr c = init(ins_it_b, ins_it_e, Cntnr(),
-			 pb_ds::detail::integral_constant<int,Native>());
+			 __gnu_pbds::detail::integral_constant<int,Native>());
 
-	  pb_ds::test::detail::multimap_find_functor<It, Cntnr, Native>
+	  __gnu_pbds::test::detail::multimap_find_functor<It, Cntnr, Native>
             fn(c, ins_it_b, ins_it_e);
 
 	  const double res =
-            pb_ds::test::detail::timing_test_base::operator()(fn);
+            __gnu_pbds::test::detail::timing_test_base::operator()(fn);
 
 	  res_set_fmt.add_res(v, res / v);
 	}
     }
   } // namespace test
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif 
 
diff --git a/libstdc++-v3/testsuite/util/performance/assoc/timing/multimap_insert_test.hpp b/libstdc++-v3/testsuite/util/performance/assoc/timing/multimap_insert_test.hpp
index e911f859483..bbdc2455c94 100644
--- a/libstdc++-v3/testsuite/util/performance/assoc/timing/multimap_insert_test.hpp
+++ b/libstdc++-v3/testsuite/util/performance/assoc/timing/multimap_insert_test.hpp
@@ -52,7 +52,7 @@
 #include <common_type/assoc/string_form.hpp>
 #include <iterator>
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace test
   {
@@ -108,7 +108,7 @@ namespace pb_ds
     } // namespace detail
 
     template<typename It, bool Native>
-    class multimap_insert_test : private pb_ds::test::detail::timing_test_base
+    class multimap_insert_test : private __gnu_pbds::test::detail::timing_test_base
     {
     public:
       multimap_insert_test(It b, size_t ins_vn, size_t ins_vs, size_t ins_vm) 
@@ -146,16 +146,16 @@ namespace pb_ds
 	  It ins_it_e = m_ins_b;
 	  std::advance(ins_it_e, v);
 
-	  pb_ds::test::detail::multimap_insert_functor<It, Cntnr, Native>
+	  __gnu_pbds::test::detail::multimap_insert_functor<It, Cntnr, Native>
             fn(ins_it_b, ins_it_e);
 
 	  const double res =
-            pb_ds::test::detail::timing_test_base::operator()(fn);
+            __gnu_pbds::test::detail::timing_test_base::operator()(fn);
 	  res_set_fmt.add_res(v, res / v);
 	}
     }
   } // namespace test
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif
 
diff --git a/libstdc++-v3/testsuite/util/performance/assoc/timing/subscript_find_test.hpp b/libstdc++-v3/testsuite/util/performance/assoc/timing/subscript_find_test.hpp
index 6415cd8ece0..af84e9c9436 100644
--- a/libstdc++-v3/testsuite/util/performance/assoc/timing/subscript_find_test.hpp
+++ b/libstdc++-v3/testsuite/util/performance/assoc/timing/subscript_find_test.hpp
@@ -51,7 +51,7 @@
 #include <common_type/assoc/string_form.hpp>
 #include <iterator>
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace test
   {
@@ -86,7 +86,7 @@ namespace pb_ds
     } // namespace detail
 
     template<typename It>
-    class subscript_find_test : private pb_ds::test::detail::timing_test_base
+    class subscript_find_test : private __gnu_pbds::test::detail::timing_test_base
     {
     public:
       subscript_find_test(It ins_b, It b, size_t ins_vn, size_t ins_vs, 
@@ -138,17 +138,17 @@ namespace pb_ds
 	  It fnd_it_e = m_fnd_b;
 	  std::advance(fnd_it_e, fnd_size);
 
-	  pb_ds::test::detail::subscript_find_functor<It, Cntnr>
+	  __gnu_pbds::test::detail::subscript_find_functor<It, Cntnr>
             fn(test_container, fnd_it_b, fnd_it_e);
 
 	  const double res =
-            pb_ds::test::detail::timing_test_base::operator()(fn);
+            __gnu_pbds::test::detail::timing_test_base::operator()(fn);
 
 	  res_set_fmt.add_res(v, res / fnd_size);
 	}
     }
   } // namespace test
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif 
 
diff --git a/libstdc++-v3/testsuite/util/performance/assoc/timing/subscript_insert_test.hpp b/libstdc++-v3/testsuite/util/performance/assoc/timing/subscript_insert_test.hpp
index 3b9efb02978..c9a9b9fdecc 100644
--- a/libstdc++-v3/testsuite/util/performance/assoc/timing/subscript_insert_test.hpp
+++ b/libstdc++-v3/testsuite/util/performance/assoc/timing/subscript_insert_test.hpp
@@ -52,7 +52,7 @@
 #include <common_type/assoc/string_form.hpp>
 #include <iterator>
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace test
   {
@@ -85,7 +85,7 @@ namespace pb_ds
     } // namespace detail
 
     template<typename It>
-    class subscript_insert_test : private pb_ds::test::detail::timing_test_base
+    class subscript_insert_test : private __gnu_pbds::test::detail::timing_test_base
     {
     public:
       subscript_insert_test(It ins_b, It b, size_t ins_vn, size_t ins_vs, 
@@ -128,17 +128,17 @@ namespace pb_ds
 	  It ins_it_b = m_ins_b;
 	  It ins_it_e = m_ins_b;
 	  std::advance(ins_it_e, v);
-	  pb_ds::test::detail::subscript_insert_functor<It, Cntnr>
+	  __gnu_pbds::test::detail::subscript_insert_functor<It, Cntnr>
             fn(ins_it_b, ins_it_e);
 
 	  const double res =
-            pb_ds::test::detail::timing_test_base::operator()(fn);
+            __gnu_pbds::test::detail::timing_test_base::operator()(fn);
 
 	  res_set_fmt.add_res(v, res / v);
 	}
     }
   } // namespace test
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif 
 
diff --git a/libstdc++-v3/testsuite/util/performance/assoc/timing/tree_order_statistics_test.hpp b/libstdc++-v3/testsuite/util/performance/assoc/timing/tree_order_statistics_test.hpp
index fb9b2c043db..8ccbfb95207 100644
--- a/libstdc++-v3/testsuite/util/performance/assoc/timing/tree_order_statistics_test.hpp
+++ b/libstdc++-v3/testsuite/util/performance/assoc/timing/tree_order_statistics_test.hpp
@@ -54,7 +54,7 @@
 #include <iterator>
 #include <cstdlib>
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace test
   {
@@ -73,7 +73,7 @@ namespace pb_ds
 	  enum
 	    {
 	      support_detected =
-	      pb_ds::test::detail::tree_supports_order_statistics<Cntnr>::value
+	      __gnu_pbds::test::detail::tree_supports_order_statistics<Cntnr>::value
 	    };
 
 	  PB_DS_STATIC_ASSERT(correct_type, support_detected);
@@ -126,7 +126,7 @@ namespace pb_ds
 
     template<bool Support_Order_Statistics>
     class tree_order_statistics_test 
-    : private pb_ds::test::detail::timing_test_base
+    : private __gnu_pbds::test::detail::timing_test_base
     {
     public:
       tree_order_statistics_test(size_t vn, size_t vs, size_t vm)
@@ -142,11 +142,11 @@ namespace pb_ds
 
       template<typename Cntnr>
       void
-      order_statistics(Cntnr& r_container, pb_ds::detail::true_type);
+      order_statistics(Cntnr& r_container, __gnu_pbds::detail::true_type);
 
       template<typename Cntnr>
       void
-      order_statistics(Cntnr& r_container, pb_ds::detail::false_type);
+      order_statistics(Cntnr& r_container, __gnu_pbds::detail::false_type);
 
     private:
       const size_t m_vn;
@@ -170,17 +170,17 @@ namespace pb_ds
 	  for (size_t ins = 0; ins < v; ++ ins)
             cntnr.insert((typename Cntnr::value_type)ins);
 
-	  pb_ds::test::detail::order_statistics_functor<Cntnr, Support_Order_Statistics>
+	  __gnu_pbds::test::detail::order_statistics_functor<Cntnr, Support_Order_Statistics>
             fn(cntnr);
 
 	  const double res =
-            pb_ds::test::detail::timing_test_base::operator()(fn);
+            __gnu_pbds::test::detail::timing_test_base::operator()(fn);
 
 	  res_set_fmt.add_res(v, res / v);
 	}
     }
   } // namespace test
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif 
 
diff --git a/libstdc++-v3/testsuite/util/performance/assoc/timing/tree_split_join_test.hpp b/libstdc++-v3/testsuite/util/performance/assoc/timing/tree_split_join_test.hpp
index 6c906522e37..7595dc2cb0d 100644
--- a/libstdc++-v3/testsuite/util/performance/assoc/timing/tree_split_join_test.hpp
+++ b/libstdc++-v3/testsuite/util/performance/assoc/timing/tree_split_join_test.hpp
@@ -52,7 +52,7 @@
 #include <common_type/assoc/string_form.hpp>
 #include <iterator>
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace test
   {
@@ -111,7 +111,7 @@ namespace pb_ds
     } // namespace detail
 
     template<bool Support_Split_Join>
-    class tree_split_join_test : private pb_ds::test::detail::timing_test_base
+    class tree_split_join_test : private __gnu_pbds::test::detail::timing_test_base
     {
     public:
       tree_split_join_test(size_t vn, size_t vs, size_t vm);
@@ -153,16 +153,16 @@ namespace pb_ds
 	  for (size_t ins = 0; ins < v; ++ ins)
             cntnr.insert((typename Cntnr::value_type)ins);
 
-	  pb_ds::test::detail::split_join_functor<Cntnr, Support_Split_Join>
+	  __gnu_pbds::test::detail::split_join_functor<Cntnr, Support_Split_Join>
             fn(cntnr);
 
 	  const double res =
-            pb_ds::test::detail::timing_test_base::operator()(fn);
+            __gnu_pbds::test::detail::timing_test_base::operator()(fn);
 	  res_set_fmt.add_res(v, res);
 	}
     }
   } // namespace test
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif 
 
diff --git a/libstdc++-v3/testsuite/util/performance/io/xml_formatter.hpp b/libstdc++-v3/testsuite/util/performance/io/xml_formatter.hpp
index e7d48d7dc48..fdaa65e73c0 100644
--- a/libstdc++-v3/testsuite/util/performance/io/xml_formatter.hpp
+++ b/libstdc++-v3/testsuite/util/performance/io/xml_formatter.hpp
@@ -51,7 +51,7 @@
 #include <iostream>
 #include <io/xml_test_formatter.hpp>
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace test
   {
@@ -83,6 +83,6 @@ namespace pb_ds
       }
     };
   } // namespace test
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif // #ifndef PB_DS_XML_TEST_PERFORMANCE_FORMATTER_HPP
diff --git a/libstdc++-v3/testsuite/util/performance/priority_queue/mem_usage/pop_test.hpp b/libstdc++-v3/testsuite/util/performance/priority_queue/mem_usage/pop_test.hpp
index a3b8486f191..4f84fa64b9c 100644
--- a/libstdc++-v3/testsuite/util/performance/priority_queue/mem_usage/pop_test.hpp
+++ b/libstdc++-v3/testsuite/util/performance/priority_queue/mem_usage/pop_test.hpp
@@ -53,7 +53,7 @@
 #include <performance/io/xml_formatter.hpp>
 #include <common_type/priority_queue/string_form.hpp>
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace test
   {
@@ -115,7 +115,7 @@ namespace pb_ds
 	}
     }
   } // namespace test
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif 
 
diff --git a/libstdc++-v3/testsuite/util/performance/priority_queue/timing/join_test.hpp b/libstdc++-v3/testsuite/util/performance/priority_queue/timing/join_test.hpp
index d04f9041b3c..e419e4f173a 100644
--- a/libstdc++-v3/testsuite/util/performance/priority_queue/timing/join_test.hpp
+++ b/libstdc++-v3/testsuite/util/performance/priority_queue/timing/join_test.hpp
@@ -53,7 +53,7 @@
 #include <common_type/priority_queue/string_form.hpp>
 #include <iterator>
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace test
   {
@@ -114,7 +114,7 @@ namespace pb_ds
     } // namespace detail
 
     template<typename It>
-    class join_test : private pb_ds::test::detail::timing_test_base
+    class join_test : private __gnu_pbds::test::detail::timing_test_base
     {
     public:
       join_test(It ins_b, size_t ins_vn, size_t ins_vs, size_t ins_vm)
@@ -125,9 +125,9 @@ namespace pb_ds
       void
       operator()(Cntnr)
       {
-	using pb_ds::test::detail::double_push_functor;
-	using pb_ds::test::detail::double_push_join_functor;
-	typedef pb_ds::test::detail::timing_test_base base_type;
+	using __gnu_pbds::test::detail::double_push_functor;
+	using __gnu_pbds::test::detail::double_push_join_functor;
+	typedef __gnu_pbds::test::detail::timing_test_base base_type;
 	typedef double_push_functor<It, Cntnr> psh_fnct;
 	typedef double_push_join_functor<It, Cntnr> psh_jn_fnct;
 
@@ -171,7 +171,7 @@ namespace pb_ds
       const size_t 	m_ins_vm;
     };
   } // namespace test
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif 
 
diff --git a/libstdc++-v3/testsuite/util/performance/priority_queue/timing/modify_test.hpp b/libstdc++-v3/testsuite/util/performance/priority_queue/timing/modify_test.hpp
index 33c7e58bdd1..1ce1804f297 100644
--- a/libstdc++-v3/testsuite/util/performance/priority_queue/timing/modify_test.hpp
+++ b/libstdc++-v3/testsuite/util/performance/priority_queue/timing/modify_test.hpp
@@ -53,7 +53,7 @@
 #include <common_type/priority_queue/string_form.hpp>
 #include <iterator>
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace test
   {
@@ -126,7 +126,7 @@ namespace pb_ds
 
       // Specializations.
       template<typename It, class Cntnr>
-      class push_functor<It, Cntnr, pb_ds::binary_heap_tag>
+      class push_functor<It, Cntnr, __gnu_pbds::binary_heap_tag>
       {
       public:
         push_functor(It ins_it_b,  It ins_it_e) 
@@ -151,7 +151,7 @@ namespace pb_ds
       };
 
       template<typename It, class Cntnr>
-      class push_functor<It, Cntnr, pb_ds::test::native_pq_tag>
+      class push_functor<It, Cntnr, __gnu_pbds::test::native_pq_tag>
       {
       public:
         push_functor(It ins_it_b,  It ins_it_e) 
@@ -178,7 +178,7 @@ namespace pb_ds
 
 
       template<typename It, class Cntnr>
-      class push_modify_functor<It, Cntnr, pb_ds::binary_heap_tag>
+      class push_modify_functor<It, Cntnr, __gnu_pbds::binary_heap_tag>
       {
       private:
 	typedef typename Cntnr::iterator iterator;
@@ -220,7 +220,7 @@ namespace pb_ds
       };
 
       template<typename It, class Cntnr>
-      class push_modify_functor<It, Cntnr, pb_ds::test::native_pq_tag>
+      class push_modify_functor<It, Cntnr, __gnu_pbds::test::native_pq_tag>
       {
       private:
 	typedef typename Cntnr::value_type value_type;
@@ -253,7 +253,7 @@ namespace pb_ds
     } // namespace detail
 
     template<typename It>
-    class modify_test : private pb_ds::test::detail::timing_test_base
+    class modify_test : private __gnu_pbds::test::detail::timing_test_base
     {
     public:
       modify_test(It b, size_t vn, size_t vs, size_t vm, bool modify_up)
@@ -333,7 +333,7 @@ namespace pb_ds
 	}
     }
   } // namespace test
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif
 
diff --git a/libstdc++-v3/testsuite/util/performance/priority_queue/timing/push_pop_test.hpp b/libstdc++-v3/testsuite/util/performance/priority_queue/timing/push_pop_test.hpp
index ef04c3258cc..a2303f9b1b3 100644
--- a/libstdc++-v3/testsuite/util/performance/priority_queue/timing/push_pop_test.hpp
+++ b/libstdc++-v3/testsuite/util/performance/priority_queue/timing/push_pop_test.hpp
@@ -53,7 +53,7 @@
 #include <common_type/priority_queue/string_form.hpp>
 #include <iterator>
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace test
   {
@@ -88,7 +88,7 @@ namespace pb_ds
     } // namespace detail
 
     template<typename It>
-    class push_pop_test : private pb_ds::test::detail::timing_test_base
+    class push_pop_test : private __gnu_pbds::test::detail::timing_test_base
     {
     public:
       push_pop_test(It ins_b, size_t ins_vn, size_t ins_vs, size_t ins_vm)
@@ -135,17 +135,17 @@ namespace pb_ds
 	  It ins_it_e = m_ins_b;
 	  std::advance(ins_it_e, v);
 
-	  pb_ds::test::detail::push_pop_push_pop_functor<It, Cntnr>
+	  __gnu_pbds::test::detail::push_pop_push_pop_functor<It, Cntnr>
             fn(ins_it_b, ins_it_e);
 
 	  const double res =
-            pb_ds::test::detail::timing_test_base::operator()(fn);
+            __gnu_pbds::test::detail::timing_test_base::operator()(fn);
 
 	  res_set_fmt.add_res(v, res / v);
 	}
     }
   } // namespace test
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif 
 
diff --git a/libstdc++-v3/testsuite/util/performance/priority_queue/timing/push_test.hpp b/libstdc++-v3/testsuite/util/performance/priority_queue/timing/push_test.hpp
index d6f280501dd..961c00ec638 100644
--- a/libstdc++-v3/testsuite/util/performance/priority_queue/timing/push_test.hpp
+++ b/libstdc++-v3/testsuite/util/performance/priority_queue/timing/push_test.hpp
@@ -53,7 +53,7 @@
 #include <common_type/priority_queue/string_form.hpp>
 #include <iterator>
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace test
   {
@@ -85,7 +85,7 @@ namespace pb_ds
     } // namespace detail
 
     template<typename It>
-    class push_test : private pb_ds::test::detail::timing_test_base
+    class push_test : private __gnu_pbds::test::detail::timing_test_base
     {
     public:
       push_test(It ins_b, size_t ins_vn, size_t ins_vs, size_t ins_vm)
@@ -127,11 +127,11 @@ namespace pb_ds
 	  It ins_it_e = m_ins_b;
 	  std::advance(ins_it_e, v);
 
-	  pb_ds::test::detail::push_push_functor<It, Cntnr>
+	  __gnu_pbds::test::detail::push_push_functor<It, Cntnr>
             fn(ins_it_b, ins_it_e);
 
 	  const double res =
-            pb_ds::test::detail::timing_test_base::operator()(fn);
+            __gnu_pbds::test::detail::timing_test_base::operator()(fn);
 
 	  res_set_fmt.add_res(v, res / v);
 	}
@@ -148,7 +148,7 @@ namespace pb_ds
         cntnr.push((typename Cntnr::const_reference)(*ins_it));
     }
   } // namespace test
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif 
 
diff --git a/libstdc++-v3/testsuite/util/performance/time/elapsed_timer.cc b/libstdc++-v3/testsuite/util/performance/time/elapsed_timer.cc
index 39748bf2d8d..e21d14dc61e 100644
--- a/libstdc++-v3/testsuite/util/performance/time/elapsed_timer.cc
+++ b/libstdc++-v3/testsuite/util/performance/time/elapsed_timer.cc
@@ -46,7 +46,7 @@
 
 #include <util/performance/time/elapsed_timer.hpp>
 
-namespace pb_ds
+namespace __gnu_pbds
 {
 
   namespace test
@@ -75,4 +75,4 @@ namespace pb_ds
 
   } // namespace test
 
-} // namespace pb_ds
+} // namespace __gnu_pbds
diff --git a/libstdc++-v3/testsuite/util/performance/time/elapsed_timer.hpp b/libstdc++-v3/testsuite/util/performance/time/elapsed_timer.hpp
index 06d9b307984..2ab7ac0e310 100644
--- a/libstdc++-v3/testsuite/util/performance/time/elapsed_timer.hpp
+++ b/libstdc++-v3/testsuite/util/performance/time/elapsed_timer.hpp
@@ -50,7 +50,7 @@
 #include <time.h>
 #include <iosfwd>
 
-namespace pb_ds
+namespace __gnu_pbds
 {
 
   namespace test
@@ -72,6 +72,6 @@ namespace pb_ds
 
   } // namespace test
 
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif // #ifndef PB_DS_TEST_TIME_HPP
diff --git a/libstdc++-v3/testsuite/util/performance/time/timing_test_base.hpp b/libstdc++-v3/testsuite/util/performance/time/timing_test_base.hpp
index a56d2c21313..8e4cd99dc0e 100644
--- a/libstdc++-v3/testsuite/util/performance/time/timing_test_base.hpp
+++ b/libstdc++-v3/testsuite/util/performance/time/timing_test_base.hpp
@@ -50,7 +50,7 @@
 #include <performance/time/elapsed_timer.hpp>
 #include <statistic/result_recorder.hpp>
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace test
   {
@@ -81,7 +81,7 @@ namespace pb_ds
       timing_test_base::operator()(Functor& fn)
       {
 	const std::size_t resolution = get_min_resolution(fn);
-	pb_ds::test::detail::result_recorder<double> rec;
+	__gnu_pbds::test::detail::result_recorder<double> rec;
 	double res;
 	do
 	  res = run_at_resolution(fn, resolution);
@@ -121,7 +121,7 @@ namespace pb_ds
 
     } // namespace detail
   } // namespace test
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif