1 files changed, 5 insertions, 30 deletions
diff --git a/libstdc++-v3/testsuite/util/native_type/assoc/native_hash_set.hpp b/libstdc++-v3/testsuite/util/native_type/assoc/native_hash_set.hpp
index c78553b73fe..86ad2482132 100644
--- a/libstdc++-v3/testsuite/util/native_type/assoc/native_hash_set.hpp
+++ b/libstdc++-v3/testsuite/util/native_type/assoc/native_hash_set.hpp
@@ -41,7 +41,7 @@
 
 /**
  * @file native_hash_set.hpp
- * Contains an adapter to Dinkumware/SGI hash tables
+ * Contains an adapter to TR1 unordered containers.
  */
 
 #ifndef PB_DS_NATIVE_HASH_SET_HPP
@@ -52,39 +52,22 @@
 #include <ext/pb_ds/detail/standard_policies.hpp>
 #include <native_type/assoc/native_hash_tag.hpp>
 #include <io/xml.hpp>
-
-// Default to using tr1.
-#define PB_DS_USE_TR1 1
-
-#ifdef PB_DS_USE_TR1
 #include <tr1/unordered_set>
-#else 
-#include <ext/hash_set>
-#endif
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace test
   {
-#ifdef PB_DS_USE_TR1
 #define PB_DS_BASE_C_DEC \
     std::tr1::__unordered_set<Key, Hash_Fn, Eq_Fn, \
     typename Allocator::template rebind<Key>::other, Cache_Hash>
-#else
-#define PB_DS_BASE_C_DEC \
-    __gnu_cxx::hash_set<Key, Hash_Fn, Eq_Fn, \
-    typename Allocator::template rebind<Key>::other>
-#endif
 
     template<typename Key,
 	     size_t Init_Size = 8,
-         typename Hash_Fn = typename pb_ds::detail::default_hash_fn<Key>::type,
+         typename Hash_Fn = typename __gnu_pbds::detail::default_hash_fn<Key>::type,
 	     typename Eq_Fn = std::equal_to<Key>,
 	     typename Less_Fn = std::less<Key>,
-	     typename Allocator = std::allocator<char>
-#ifdef PB_DS_USE_TR1
-	     , bool Cache_Hash = false
-#endif
+	     typename Allocator = std::allocator<char>, bool Cache_Hash = false
 	     >
     class native_hash_set : public PB_DS_BASE_C_DEC
     {
@@ -129,32 +112,24 @@ namespace pb_ds
       static std::string
       name()
       {
-#ifdef PB_DS_USE_TR1
         return std::string("n_hash_set_") 
 	       + (Cache_Hash ? std::string("cah") : std::string("ncah"));
-#else
-        return std::string("n_hash_set_ncah");
-#endif
       }
 
       static std::string
       desc()
       {
-#ifdef PB_DS_USE_TR1
         const std::string cache_hash_desc =
 	make_xml_tag("cache_hash_code", "value",
 		     Cache_Hash ? std::string("true") : std::string("false"));
 
         return make_xml_tag("type", "value", "std_tr1_unordered_set", 
 			    cache_hash_desc);
-#else
-        return make_xml_tag("type", "value", "__gnucxx_hash_set");
-#endif
       }
     };
 
 #undef PB_DS_BASE_C_DEC
   } // namespace test
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif