diff options
Diffstat (limited to 'libstdc++-v3/testsuite/util/regression')
33 files changed, 195 insertions, 195 deletions
diff --git a/libstdc++-v3/testsuite/util/regression/assoc/common_type.hpp b/libstdc++-v3/testsuite/util/regression/assoc/common_type.hpp index 0f86f38da3d..61f04a8336d 100644 --- a/libstdc++-v3/testsuite/util/regression/assoc/common_type.hpp +++ b/libstdc++-v3/testsuite/util/regression/assoc/common_type.hpp @@ -50,7 +50,7 @@ #include <regression/basic_type.hpp> #include <common_type/assoc/common_type.hpp> -namespace pb_ds +namespace __gnu_pbds { namespace test { @@ -72,15 +72,15 @@ namespace test } }; - typedef pb_ds::string_trie_e_access_traits<basic_type, 'a', 'a' + basic_type::distinct_chars - 1, false, alloc_type> e_access_traits_t; + typedef __gnu_pbds::string_trie_e_access_traits<basic_type, 'a', 'a' + basic_type::distinct_chars - 1, false, alloc_type> e_access_traits_t; template<typename Data_Type> struct tree_types { private: - typedef typename tree_common_types<basic_type, Data_Type, std::less<basic_type>, pb_ds::null_tree_node_update, alloc_type>::regression_tl no_order_statistics_tl_t; + typedef typename tree_common_types<basic_type, Data_Type, std::less<basic_type>, __gnu_pbds::null_tree_node_update, alloc_type>::regression_tl no_order_statistics_tl_t; - typedef typename tree_common_types<basic_type, Data_Type, std::less<basic_type>, pb_ds::tree_order_statistics_node_update, alloc_type>::regression_tl order_statistics_tl_t; + typedef typename tree_common_types<basic_type, Data_Type, std::less<basic_type>, __gnu_pbds::tree_order_statistics_node_update, alloc_type>::regression_tl order_statistics_tl_t; public: typedef typename __gnu_cxx::typelist::append<no_order_statistics_tl_t, order_statistics_tl_t>::type tl_t; @@ -92,11 +92,11 @@ namespace test struct trie_types { private: - typedef typename trie_common_types<basic_type, Data_Type, e_access_traits_t, pb_ds::pat_trie_tag, pb_ds::null_trie_node_update, alloc_type>::regression_tl no_updates_tl_t; + typedef typename trie_common_types<basic_type, Data_Type, e_access_traits_t, __gnu_pbds::pat_trie_tag, __gnu_pbds::null_trie_node_update, alloc_type>::regression_tl no_updates_tl_t; - typedef typename trie_common_types<basic_type, Data_Type, e_access_traits_t, pb_ds::pat_trie_tag, pb_ds::trie_order_statistics_node_update, alloc_type>::regression_tl order_statistics_tl_t; + typedef typename trie_common_types<basic_type, Data_Type, e_access_traits_t, __gnu_pbds::pat_trie_tag, __gnu_pbds::trie_order_statistics_node_update, alloc_type>::regression_tl order_statistics_tl_t; - typedef typename trie_common_types<basic_type, Data_Type, e_access_traits_t, pb_ds::pat_trie_tag, pb_ds::trie_prefix_search_node_update, alloc_type>::regression_tl prefix_search_tl_t; + typedef typename trie_common_types<basic_type, Data_Type, e_access_traits_t, __gnu_pbds::pat_trie_tag, __gnu_pbds::trie_prefix_search_node_update, alloc_type>::regression_tl prefix_search_tl_t; public: typedef typename __gnu_cxx::typelist::append<no_updates_tl_t, typename __gnu_cxx::typelist::append<prefix_search_tl_t, order_statistics_tl_t>::type>::type tl_t; @@ -140,6 +140,6 @@ namespace test typedef trie_types<basic_type>::tl_t trie_map_tl_t; typedef trie_types<basic_type>::min_tl_t min_trie_map_tl_t; } // namespace test -} // namespace pb_ds +} // namespace __gnu_pbds #endif diff --git a/libstdc++-v3/testsuite/util/regression/basic_type.hpp b/libstdc++-v3/testsuite/util/regression/basic_type.hpp index ad93bf47142..93a12922ffa 100644 --- a/libstdc++-v3/testsuite/util/regression/basic_type.hpp +++ b/libstdc++-v3/testsuite/util/regression/basic_type.hpp @@ -50,7 +50,7 @@ #include <string> #include <ext/throw_allocator.h> -namespace pb_ds +namespace __gnu_pbds { namespace test { @@ -99,6 +99,6 @@ namespace test #undef PB_DS_BASE_C_DEC } // namespace test -} // namespace pb_ds +} // namespace __gnu_pbds #endif diff --git a/libstdc++-v3/testsuite/util/regression/priority_queue/common_type.hpp b/libstdc++-v3/testsuite/util/regression/priority_queue/common_type.hpp index ce5a9e81a01..7740a913852 100644 --- a/libstdc++-v3/testsuite/util/regression/priority_queue/common_type.hpp +++ b/libstdc++-v3/testsuite/util/regression/priority_queue/common_type.hpp @@ -50,7 +50,7 @@ #include <regression/basic_type.hpp> #include <common_type/priority_queue/common_type.hpp> -namespace pb_ds +namespace __gnu_pbds { namespace test { @@ -60,6 +60,6 @@ namespace test typedef pq_tl_t min_pq_tl_t; } // namespace test -} // namespace pb_ds +} // namespace __gnu_pbds #endif diff --git a/libstdc++-v3/testsuite/util/regression/rand/assoc/container_rand_regression_test.hpp b/libstdc++-v3/testsuite/util/regression/rand/assoc/container_rand_regression_test.hpp index 3f77c219e00..7eaa3968f9a 100644 --- a/libstdc++-v3/testsuite/util/regression/rand/assoc/container_rand_regression_test.hpp +++ b/libstdc++-v3/testsuite/util/regression/rand/assoc/container_rand_regression_test.hpp @@ -58,7 +58,7 @@ #include <common_type/assoc/string_form.hpp> #include <regression/rand/io/assoc/xml_formatter.hpp> -namespace pb_ds +namespace __gnu_pbds { namespace test { @@ -137,7 +137,7 @@ namespace detail typedef typename test_traits::value_type value_type; typedef typename test_traits::native_type native_type; typedef twister_rand_gen gen; - typedef pb_ds::container_traits<Cntnr> container_traits; + typedef __gnu_pbds::container_traits<Cntnr> container_traits; typedef __gnu_cxx::throw_allocator<char> alloc_t; enum op @@ -173,52 +173,52 @@ namespace detail iterator_defs(); static void - node_iterator_defs(pb_ds::detail::false_type); + node_iterator_defs(__gnu_pbds::detail::false_type); static void - node_iterator_defs(pb_ds::detail::true_type); + node_iterator_defs(__gnu_pbds::detail::true_type); static void policy_defs(); static void - policy_defs(pb_ds::basic_hash_tag); + policy_defs(__gnu_pbds::basic_hash_tag); static void - policy_defs(pb_ds::cc_hash_tag); + policy_defs(__gnu_pbds::cc_hash_tag); static void - policy_defs(pb_ds::gp_hash_tag); + policy_defs(__gnu_pbds::gp_hash_tag); static void - policy_defs(pb_ds::tree_tag); + policy_defs(__gnu_pbds::tree_tag); static void - policy_defs(pb_ds::list_update_tag); + policy_defs(__gnu_pbds::list_update_tag); static void - policy_defs(pb_ds::pat_trie_tag); + policy_defs(__gnu_pbds::pat_trie_tag); void policy_access(); void - policy_access(pb_ds::basic_hash_tag); + policy_access(__gnu_pbds::basic_hash_tag); void - policy_access(pb_ds::cc_hash_tag); + policy_access(__gnu_pbds::cc_hash_tag); void - policy_access(pb_ds::gp_hash_tag); + policy_access(__gnu_pbds::gp_hash_tag); void - policy_access(pb_ds::tree_tag); + policy_access(__gnu_pbds::tree_tag); void - policy_access(pb_ds::list_update_tag); + policy_access(__gnu_pbds::list_update_tag); void - policy_access(pb_ds::pat_trie_tag); + policy_access(__gnu_pbds::pat_trie_tag); void it_copy(); @@ -233,16 +233,16 @@ namespace detail rev_it_assign(); void - rev_it_copy_imp(pb_ds::detail::false_type); + rev_it_copy_imp(__gnu_pbds::detail::false_type); void - rev_it_copy_imp(pb_ds::detail::true_type); + rev_it_copy_imp(__gnu_pbds::detail::true_type); void - rev_it_assign_imp(pb_ds::detail::false_type); + rev_it_assign_imp(__gnu_pbds::detail::false_type); void - rev_it_assign_imp(pb_ds::detail::true_type); + rev_it_assign_imp(__gnu_pbds::detail::true_type); bool default_constructor(); @@ -260,19 +260,19 @@ namespace detail it_constructor(); bool - it_constructor_imp(pb_ds::cc_hash_tag); + it_constructor_imp(__gnu_pbds::cc_hash_tag); bool - it_constructor_imp(pb_ds::gp_hash_tag); + it_constructor_imp(__gnu_pbds::gp_hash_tag); bool - it_constructor_imp(pb_ds::tree_tag); + it_constructor_imp(__gnu_pbds::tree_tag); bool - it_constructor_imp(pb_ds::list_update_tag); + it_constructor_imp(__gnu_pbds::list_update_tag); bool - it_constructor_imp(pb_ds::pat_trie_tag); + it_constructor_imp(__gnu_pbds::pat_trie_tag); bool insert(); @@ -284,19 +284,19 @@ namespace detail erase_it(); bool - erase_it_imp(pb_ds::detail::false_type); + erase_it_imp(__gnu_pbds::detail::false_type); bool - erase_it_imp(pb_ds::detail::true_type); + erase_it_imp(__gnu_pbds::detail::true_type); bool erase_rev_it(); bool - erase_rev_it_imp(pb_ds::detail::false_type); + erase_rev_it_imp(__gnu_pbds::detail::false_type); bool - erase_rev_it_imp(pb_ds::detail::true_type); + erase_rev_it_imp(__gnu_pbds::detail::true_type); bool erase_if(); @@ -308,46 +308,46 @@ namespace detail resize(); bool - resize_imp(pb_ds::detail::true_type); + resize_imp(__gnu_pbds::detail::true_type); bool - resize_imp(pb_ds::detail::false_type); + resize_imp(__gnu_pbds::detail::false_type); bool get_set_loads(); bool - get_set_loads_imp(pb_ds::detail::true_type); + get_set_loads_imp(__gnu_pbds::detail::true_type); bool - get_set_loads_imp(pb_ds::detail::false_type); + get_set_loads_imp(__gnu_pbds::detail::false_type); void get_set_load(); void - get_set_load_imp(pb_ds::detail::true_type); + get_set_load_imp(__gnu_pbds::detail::true_type); void - get_set_load_imp(pb_ds::detail::false_type); + get_set_load_imp(__gnu_pbds::detail::false_type); bool subscript(); bool - subscript_imp(pb_ds::detail::false_type); + subscript_imp(__gnu_pbds::detail::false_type); bool - subscript_imp(pb_ds::detail::true_type); + subscript_imp(__gnu_pbds::detail::true_type); bool split_join(); bool - split_join_imp(pb_ds::detail::false_type); + split_join_imp(__gnu_pbds::detail::false_type); bool - split_join_imp(pb_ds::detail::true_type); + split_join_imp(__gnu_pbds::detail::true_type); void cmp(const Cntnr&, const native_type&, const std::string&); @@ -360,43 +360,43 @@ namespace detail void order_preserving_cmp_imp(const Cntnr&, const native_type&, - pb_ds::detail::false_type); + __gnu_pbds::detail::false_type); void order_preserving_cmp_imp(const Cntnr&, const native_type&, - pb_ds::detail::true_type); + __gnu_pbds::detail::true_type); void back_order_preserving_cmp_imp(const Cntnr&, const native_type&, - pb_ds::detail::false_type); + __gnu_pbds::detail::false_type); void back_order_preserving_cmp_imp(const Cntnr&, const native_type&, - pb_ds::detail::true_type); + __gnu_pbds::detail::true_type); void reverse_iteration_cmp_imp(const Cntnr&, const native_type&, - pb_ds::detail::false_type); + __gnu_pbds::detail::false_type); void reverse_iteration_cmp_imp(const Cntnr&, const native_type&, - pb_ds::detail::true_type); + __gnu_pbds::detail::true_type); void order_statistics_cmp_imp(const Cntnr&, const native_type&, - pb_ds::detail::false_type); + __gnu_pbds::detail::false_type); void order_statistics_cmp_imp(const Cntnr&, const native_type&, - pb_ds::detail::true_type); + __gnu_pbds::detail::true_type); void prefix_search_cmp_imp(const Cntnr&, const native_type&, - pb_ds::detail::false_type); + __gnu_pbds::detail::false_type); void prefix_search_cmp_imp(const Cntnr&, const native_type&, - pb_ds::detail::true_type); + __gnu_pbds::detail::true_type); template<typename Const_It, class Const_Native_It> void @@ -408,19 +408,19 @@ namespace detail void lower_bound_cmp_imp(const Cntnr&, const native_type&, - pb_ds::detail::false_type); + __gnu_pbds::detail::false_type); void lower_bound_cmp_imp(const Cntnr&, const native_type&, - pb_ds::detail::true_type); + __gnu_pbds::detail::true_type); void upper_bound_cmp_imp(const Cntnr&, const native_type&, - pb_ds::detail::false_type); + __gnu_pbds::detail::false_type); void upper_bound_cmp_imp(const Cntnr&, const native_type&, - pb_ds::detail::true_type); + __gnu_pbds::detail::true_type); void print_container(const native_type&, std::ostream& r_os = std::cerr) const; @@ -495,6 +495,6 @@ namespace detail } // namespace detail } // namespace test -} // namespace pb_ds +} // namespace __gnu_pbds #endif diff --git a/libstdc++-v3/testsuite/util/regression/rand/assoc/detail/cmp_fn_imps.hpp b/libstdc++-v3/testsuite/util/regression/rand/assoc/detail/cmp_fn_imps.hpp index 2b1325f8e51..3b19a752696 100644 --- a/libstdc++-v3/testsuite/util/regression/rand/assoc/detail/cmp_fn_imps.hpp +++ b/libstdc++-v3/testsuite/util/regression/rand/assoc/detail/cmp_fn_imps.hpp @@ -140,50 +140,50 @@ cmp_(const Cntnr& r_c, const native_type& r_native_c) container_traits::order_preserving, back_order_preserving = container_traits::order_preserving&& - !pb_ds::detail::is_same< + !__gnu_pbds::detail::is_same< typename std::iterator_traits< typename cntnr::const_iterator>::iterator_category, std::forward_iterator_tag>::value, reverse_iteration = container_traits::reverse_iteration, order_statistics = test_traits::order_statistics, prefix_search = test_traits::prefix_search, - has_mapped = !pb_ds::detail::is_same< + has_mapped = !__gnu_pbds::detail::is_same< typename Cntnr::mapped_type, - pb_ds::null_mapped_type>::value + __gnu_pbds::null_mapped_type>::value }; order_preserving_cmp_imp(r_c, r_native_c, - pb_ds::detail::integral_constant<int,order_preserving>()); + __gnu_pbds::detail::integral_constant<int,order_preserving>()); back_order_preserving_cmp_imp(r_c, r_native_c, - pb_ds::detail::integral_constant<int,back_order_preserving>()); + __gnu_pbds::detail::integral_constant<int,back_order_preserving>()); order_statistics_cmp_imp(r_c, r_native_c, - pb_ds::detail::integral_constant<int,order_statistics>()); + __gnu_pbds::detail::integral_constant<int,order_statistics>()); prefix_search_cmp_imp(r_c, r_native_c, - pb_ds::detail::integral_constant<int,prefix_search>()); + __gnu_pbds::detail::integral_constant<int,prefix_search>()); reverse_iteration_cmp_imp(r_c, r_native_c, - pb_ds::detail::integral_constant<int,reverse_iteration>()); + __gnu_pbds::detail::integral_constant<int,reverse_iteration>()); lower_bound_cmp_imp(r_c, r_native_c, - pb_ds::detail::integral_constant<int,order_preserving>()); + __gnu_pbds::detail::integral_constant<int,order_preserving>()); upper_bound_cmp_imp(r_c, r_native_c, - pb_ds::detail::integral_constant<int,order_preserving>()); + __gnu_pbds::detail::integral_constant<int,order_preserving>()); } PB_DS_CLASS_T_DEC void PB_DS_CLASS_C_DEC:: -order_preserving_cmp_imp(const Cntnr& /*r_c*/, const native_type& /*r_native_c*/, pb_ds::detail::false_type) +order_preserving_cmp_imp(const Cntnr& /*r_c*/, const native_type& /*r_native_c*/, __gnu_pbds::detail::false_type) { } PB_DS_CLASS_T_DEC void PB_DS_CLASS_C_DEC:: -order_preserving_cmp_imp(const Cntnr& r_c, const native_type& r_native_c, pb_ds::detail::true_type) +order_preserving_cmp_imp(const Cntnr& r_c, const native_type& r_native_c, __gnu_pbds::detail::true_type) { PB_DS_SET_DESTRUCT_PRINT @@ -217,13 +217,13 @@ order_preserving_cmp_imp(const Cntnr& r_c, const native_type& r_native_c, pb_ds: PB_DS_CLASS_T_DEC void PB_DS_CLASS_C_DEC:: -back_order_preserving_cmp_imp(const Cntnr& /*r_c*/, const native_type& /*r_native_c*/, pb_ds::detail::false_type) +back_order_preserving_cmp_imp(const Cntnr& /*r_c*/, const native_type& /*r_native_c*/, __gnu_pbds::detail::false_type) { } PB_DS_CLASS_T_DEC void PB_DS_CLASS_C_DEC:: -back_order_preserving_cmp_imp(const Cntnr& r_c, const native_type& r_native_c, pb_ds::detail::true_type) +back_order_preserving_cmp_imp(const Cntnr& r_c, const native_type& r_native_c, __gnu_pbds::detail::true_type) { PB_DS_SET_DESTRUCT_PRINT @@ -241,13 +241,13 @@ back_order_preserving_cmp_imp(const Cntnr& r_c, const native_type& r_native_c, p PB_DS_CLASS_T_DEC void PB_DS_CLASS_C_DEC:: -reverse_iteration_cmp_imp(const Cntnr& /*r_c*/, const native_type& /*r_native_c*/, pb_ds::detail::false_type) +reverse_iteration_cmp_imp(const Cntnr& /*r_c*/, const native_type& /*r_native_c*/, __gnu_pbds::detail::false_type) { } PB_DS_CLASS_T_DEC void PB_DS_CLASS_C_DEC:: -reverse_iteration_cmp_imp(const Cntnr& r_c, const native_type& r_native_c, pb_ds::detail::true_type) +reverse_iteration_cmp_imp(const Cntnr& r_c, const native_type& r_native_c, __gnu_pbds::detail::true_type) { PB_DS_SET_DESTRUCT_PRINT @@ -281,13 +281,13 @@ reverse_iteration_cmp_imp(const Cntnr& r_c, const native_type& r_native_c, pb_ds PB_DS_CLASS_T_DEC void PB_DS_CLASS_C_DEC:: -order_statistics_cmp_imp(const Cntnr& /*r_c*/, const native_type& /*r_native_c*/, pb_ds::detail::false_type) +order_statistics_cmp_imp(const Cntnr& /*r_c*/, const native_type& /*r_native_c*/, __gnu_pbds::detail::false_type) { } PB_DS_CLASS_T_DEC void PB_DS_CLASS_C_DEC:: -order_statistics_cmp_imp(const Cntnr& r_c, const native_type& r_native_c, pb_ds::detail::true_type) +order_statistics_cmp_imp(const Cntnr& r_c, const native_type& r_native_c, __gnu_pbds::detail::true_type) { { m_alloc.set_throw_prob(0); @@ -350,13 +350,13 @@ order_statistics_cmp_imp(const Cntnr& r_c, const native_type& r_native_c, pb_ds: PB_DS_CLASS_T_DEC void PB_DS_CLASS_C_DEC:: -prefix_search_cmp_imp(const Cntnr& /*r_c*/, const native_type& /*r_native_c*/, pb_ds::detail::false_type) +prefix_search_cmp_imp(const Cntnr& /*r_c*/, const native_type& /*r_native_c*/, __gnu_pbds::detail::false_type) { } PB_DS_CLASS_T_DEC void PB_DS_CLASS_C_DEC:: -prefix_search_cmp_imp(const Cntnr& r_c, const native_type& r_native_c, pb_ds::detail::true_type) +prefix_search_cmp_imp(const Cntnr& r_c, const native_type& r_native_c, __gnu_pbds::detail::true_type) { PB_DS_SET_DESTRUCT_PRINT @@ -495,13 +495,13 @@ back_it_cmp_imp(Const_It b, Const_It e, Const_Native_It native_b, Const_Native_I PB_DS_CLASS_T_DEC void PB_DS_CLASS_C_DEC:: -lower_bound_cmp_imp(const Cntnr& /*r_c*/, const native_type& /*r_native_c*/, pb_ds::detail::false_type) +lower_bound_cmp_imp(const Cntnr& /*r_c*/, const native_type& /*r_native_c*/, __gnu_pbds::detail::false_type) { } PB_DS_CLASS_T_DEC void PB_DS_CLASS_C_DEC:: -lower_bound_cmp_imp(const Cntnr& r_c, const native_type& r_native_c, pb_ds::detail::true_type) +lower_bound_cmp_imp(const Cntnr& r_c, const native_type& r_native_c, __gnu_pbds::detail::true_type) { PB_DS_SET_DESTRUCT_PRINT @@ -548,13 +548,13 @@ lower_bound_cmp_imp(const Cntnr& r_c, const native_type& r_native_c, pb_ds::deta PB_DS_CLASS_T_DEC void PB_DS_CLASS_C_DEC:: -upper_bound_cmp_imp(const Cntnr& /*r_c*/, const native_type& /*r_native_c*/, pb_ds::detail::false_type) +upper_bound_cmp_imp(const Cntnr& /*r_c*/, const native_type& /*r_native_c*/, __gnu_pbds::detail::false_type) { } PB_DS_CLASS_T_DEC void PB_DS_CLASS_C_DEC:: -upper_bound_cmp_imp(const Cntnr& r_c, const native_type& r_native_c, pb_ds::detail::true_type) +upper_bound_cmp_imp(const Cntnr& r_c, const native_type& r_native_c, __gnu_pbds::detail::true_type) { PB_DS_SET_DESTRUCT_PRINT diff --git a/libstdc++-v3/testsuite/util/regression/rand/assoc/detail/constructor_destructor_fn_imps.hpp b/libstdc++-v3/testsuite/util/regression/rand/assoc/detail/constructor_destructor_fn_imps.hpp index 66a7077470f..c6b02b61a17 100644 --- a/libstdc++-v3/testsuite/util/regression/rand/assoc/detail/constructor_destructor_fn_imps.hpp +++ b/libstdc++-v3/testsuite/util/regression/rand/assoc/detail/constructor_destructor_fn_imps.hpp @@ -162,7 +162,7 @@ it_constructor() PB_DS_CLASS_T_DEC bool PB_DS_CLASS_C_DEC:: -it_constructor_imp(pb_ds::cc_hash_tag) +it_constructor_imp(__gnu_pbds::cc_hash_tag) { bool done = true; Cntnr* p_c = NULL; @@ -229,7 +229,7 @@ it_constructor_imp(pb_ds::cc_hash_tag) PB_DS_CLASS_T_DEC bool PB_DS_CLASS_C_DEC:: -it_constructor_imp(pb_ds::gp_hash_tag) +it_constructor_imp(__gnu_pbds::gp_hash_tag) { bool done = true; Cntnr* p_c = NULL; @@ -312,7 +312,7 @@ it_constructor_imp(pb_ds::gp_hash_tag) PB_DS_CLASS_T_DEC bool PB_DS_CLASS_C_DEC:: -it_constructor_imp(pb_ds::tree_tag) +it_constructor_imp(__gnu_pbds::tree_tag) { bool done = true; Cntnr* p_c = NULL; @@ -348,7 +348,7 @@ it_constructor_imp(pb_ds::tree_tag) PB_DS_CLASS_T_DEC bool PB_DS_CLASS_C_DEC:: -it_constructor_imp(pb_ds::list_update_tag) +it_constructor_imp(__gnu_pbds::list_update_tag) { bool done = true; Cntnr* p_c = NULL; @@ -373,7 +373,7 @@ it_constructor_imp(pb_ds::list_update_tag) PB_DS_CLASS_T_DEC bool PB_DS_CLASS_C_DEC:: -it_constructor_imp(pb_ds::pat_trie_tag) +it_constructor_imp(__gnu_pbds::pat_trie_tag) { bool done = true; Cntnr* p_c = NULL; diff --git a/libstdc++-v3/testsuite/util/regression/rand/assoc/detail/defs_fn_imps.hpp b/libstdc++-v3/testsuite/util/regression/rand/assoc/detail/defs_fn_imps.hpp index 68829d3e187..0acb20cd62e 100644 --- a/libstdc++-v3/testsuite/util/regression/rand/assoc/detail/defs_fn_imps.hpp +++ b/libstdc++-v3/testsuite/util/regression/rand/assoc/detail/defs_fn_imps.hpp @@ -63,7 +63,7 @@ defs() iterator_defs(); - node_iterator_defs(pb_ds::detail::integral_constant<int, + node_iterator_defs(__gnu_pbds::detail::integral_constant<int, container_traits::order_preserving>()); policy_defs(); @@ -124,7 +124,7 @@ void PB_DS_CLASS_C_DEC:: ds_defs() { - typedef pb_ds::container_traits< Cntnr> test_container_traits; + typedef __gnu_pbds::container_traits< Cntnr> test_container_traits; typedef typename test_container_traits::container_category test_container_category; @@ -162,13 +162,13 @@ iterator_defs() PB_DS_CLASS_T_DEC void PB_DS_CLASS_C_DEC:: -node_iterator_defs(pb_ds::detail::false_type) +node_iterator_defs(__gnu_pbds::detail::false_type) { } PB_DS_CLASS_T_DEC void PB_DS_CLASS_C_DEC:: -node_iterator_defs(pb_ds::detail::true_type) +node_iterator_defs(__gnu_pbds::detail::true_type) { typedef typename Cntnr::node_iterator test_node_iterator; @@ -188,7 +188,7 @@ policy_defs() PB_DS_CLASS_T_DEC void PB_DS_CLASS_C_DEC:: -policy_defs(pb_ds::basic_hash_tag) +policy_defs(__gnu_pbds::basic_hash_tag) { typedef typename Cntnr::hash_fn test_hash_fn; @@ -200,9 +200,9 @@ policy_defs(pb_ds::basic_hash_tag) PB_DS_CLASS_T_DEC void PB_DS_CLASS_C_DEC:: -policy_defs(pb_ds::cc_hash_tag) +policy_defs(__gnu_pbds::cc_hash_tag) { - policy_defs(pb_ds::basic_hash_tag()); + policy_defs(__gnu_pbds::basic_hash_tag()); typedef typename Cntnr::comb_hash_fn test_comb_hash_fn; } @@ -210,9 +210,9 @@ policy_defs(pb_ds::cc_hash_tag) PB_DS_CLASS_T_DEC void PB_DS_CLASS_C_DEC:: -policy_defs(pb_ds::gp_hash_tag) +policy_defs(__gnu_pbds::gp_hash_tag) { - policy_defs(pb_ds::basic_hash_tag()); + policy_defs(__gnu_pbds::basic_hash_tag()); typedef typename Cntnr::comb_probe_fn test_comb_probe_fn; @@ -222,7 +222,7 @@ policy_defs(pb_ds::gp_hash_tag) PB_DS_CLASS_T_DEC void PB_DS_CLASS_C_DEC:: -policy_defs(pb_ds::tree_tag) +policy_defs(__gnu_pbds::tree_tag) { typedef typename Cntnr::cmp_fn test_cmp_fn; @@ -232,7 +232,7 @@ policy_defs(pb_ds::tree_tag) PB_DS_CLASS_T_DEC void PB_DS_CLASS_C_DEC:: -policy_defs(pb_ds::list_update_tag) +policy_defs(__gnu_pbds::list_update_tag) { typedef typename Cntnr::eq_fn test_eq_fn; @@ -242,7 +242,7 @@ policy_defs(pb_ds::list_update_tag) PB_DS_CLASS_T_DEC void PB_DS_CLASS_C_DEC:: -policy_defs(pb_ds::pat_trie_tag) +policy_defs(__gnu_pbds::pat_trie_tag) { typedef typename Cntnr::e_access_traits e_access_traits; } diff --git a/libstdc++-v3/testsuite/util/regression/rand/assoc/detail/erase_fn_imps.hpp b/libstdc++-v3/testsuite/util/regression/rand/assoc/detail/erase_fn_imps.hpp index 0622d9eeef9..0bd39f33bb3 100644 --- a/libstdc++-v3/testsuite/util/regression/rand/assoc/detail/erase_fn_imps.hpp +++ b/libstdc++-v3/testsuite/util/regression/rand/assoc/detail/erase_fn_imps.hpp @@ -166,13 +166,13 @@ erase_it() container_traits::order_preserving }; - return (erase_it_imp(pb_ds::detail::integral_constant<int,erase_iterators>())); + return (erase_it_imp(__gnu_pbds::detail::integral_constant<int,erase_iterators>())); } PB_DS_CLASS_T_DEC bool PB_DS_CLASS_C_DEC:: -erase_it_imp(pb_ds::detail::false_type) +erase_it_imp(__gnu_pbds::detail::false_type) { return (true); } @@ -180,7 +180,7 @@ erase_it_imp(pb_ds::detail::false_type) PB_DS_CLASS_T_DEC bool PB_DS_CLASS_C_DEC:: -erase_it_imp(pb_ds::detail::true_type) +erase_it_imp(__gnu_pbds::detail::true_type) { PB_DS_TRACE("erase_it"); @@ -222,9 +222,9 @@ erase_it_imp(pb_ds::detail::true_type) m_native_c.erase(native_it); bool range_guarantee = - pb_ds::detail::is_same< + __gnu_pbds::detail::is_same< typename container_traits::invalidation_guarantee, - pb_ds::range_invalidation_guarantee>::value ; + __gnu_pbds::range_invalidation_guarantee>::value ; if (range_guarantee) PB_DS_THROW_IF_FAILED( next_ers_it == next_it, "", m_p_c, & m_native_c); @@ -255,13 +255,13 @@ erase_rev_it() container_traits::reverse_iteration }; - return (erase_rev_it_imp(pb_ds::detail::integral_constant<int,erase_iterators>())); + return (erase_rev_it_imp(__gnu_pbds::detail::integral_constant<int,erase_iterators>())); } PB_DS_CLASS_T_DEC bool PB_DS_CLASS_C_DEC:: -erase_rev_it_imp(pb_ds::detail::false_type) +erase_rev_it_imp(__gnu_pbds::detail::false_type) { return (true); } @@ -269,7 +269,7 @@ erase_rev_it_imp(pb_ds::detail::false_type) PB_DS_CLASS_T_DEC bool PB_DS_CLASS_C_DEC:: -erase_rev_it_imp(pb_ds::detail::true_type) +erase_rev_it_imp(__gnu_pbds::detail::true_type) { PB_DS_TRACE("erase_rev_it"); diff --git a/libstdc++-v3/testsuite/util/regression/rand/assoc/detail/get_set_load_fn_imps.hpp b/libstdc++-v3/testsuite/util/regression/rand/assoc/detail/get_set_load_fn_imps.hpp index 8f58f3e2c46..adc87271c25 100644 --- a/libstdc++-v3/testsuite/util/regression/rand/assoc/detail/get_set_load_fn_imps.hpp +++ b/libstdc++-v3/testsuite/util/regression/rand/assoc/detail/get_set_load_fn_imps.hpp @@ -50,7 +50,7 @@ PB_DS_CLASS_C_DEC:: get_set_load() { typedef - pb_ds::detail::integral_constant<int, + __gnu_pbds::detail::integral_constant<int, test_traits::get_set_load> get_set_load_ind; @@ -60,13 +60,13 @@ get_set_load() PB_DS_CLASS_T_DEC void PB_DS_CLASS_C_DEC:: -get_set_load_imp(pb_ds::detail::false_type) +get_set_load_imp(__gnu_pbds::detail::false_type) { } PB_DS_CLASS_T_DEC void PB_DS_CLASS_C_DEC:: -get_set_load_imp(pb_ds::detail::true_type) +get_set_load_imp(__gnu_pbds::detail::true_type) { PB_DS_TRACE("get_set_load"); diff --git a/libstdc++-v3/testsuite/util/regression/rand/assoc/detail/get_set_loads_fn_imps.hpp b/libstdc++-v3/testsuite/util/regression/rand/assoc/detail/get_set_loads_fn_imps.hpp index cbcac81c631..10ea2aed941 100644 --- a/libstdc++-v3/testsuite/util/regression/rand/assoc/detail/get_set_loads_fn_imps.hpp +++ b/libstdc++-v3/testsuite/util/regression/rand/assoc/detail/get_set_loads_fn_imps.hpp @@ -50,7 +50,7 @@ PB_DS_CLASS_C_DEC:: get_set_loads() { typedef - pb_ds::detail::integral_constant<int, + __gnu_pbds::detail::integral_constant<int, test_traits::get_set_loads> get_set_loads_ind; @@ -60,7 +60,7 @@ get_set_loads() PB_DS_CLASS_T_DEC bool PB_DS_CLASS_C_DEC:: -get_set_loads_imp(pb_ds::detail::false_type) +get_set_loads_imp(__gnu_pbds::detail::false_type) { return (true); } @@ -68,7 +68,7 @@ get_set_loads_imp(pb_ds::detail::false_type) PB_DS_CLASS_T_DEC bool PB_DS_CLASS_C_DEC:: -get_set_loads_imp(pb_ds::detail::true_type) +get_set_loads_imp(__gnu_pbds::detail::true_type) { PB_DS_TRACE("get_set_loads"); diff --git a/libstdc++-v3/testsuite/util/regression/rand/assoc/detail/insert_fn_imps.hpp b/libstdc++-v3/testsuite/util/regression/rand/assoc/detail/insert_fn_imps.hpp index 78fc38907b6..e5bf3be35b0 100644 --- a/libstdc++-v3/testsuite/util/regression/rand/assoc/detail/insert_fn_imps.hpp +++ b/libstdc++-v3/testsuite/util/regression/rand/assoc/detail/insert_fn_imps.hpp @@ -77,7 +77,7 @@ insert() { done = false; } - catch(pb_ds::insert_error&) + catch(__gnu_pbds::insert_error&) { PB_DS_THROW_IF_FAILED(false, "", m_p_c, &m_native_c); } diff --git a/libstdc++-v3/testsuite/util/regression/rand/assoc/detail/it_conversion_fn_imps.hpp b/libstdc++-v3/testsuite/util/regression/rand/assoc/detail/it_conversion_fn_imps.hpp index 14d89e1ebf9..2a3c6396e8a 100644 --- a/libstdc++-v3/testsuite/util/regression/rand/assoc/detail/it_conversion_fn_imps.hpp +++ b/libstdc++-v3/testsuite/util/regression/rand/assoc/detail/it_conversion_fn_imps.hpp @@ -195,7 +195,7 @@ rev_it_copy() reverse_iteration = container_traits::reverse_iteration }; - rev_it_copy_imp(pb_ds::detail::integral_constant<int,reverse_iteration>()); + rev_it_copy_imp(__gnu_pbds::detail::integral_constant<int,reverse_iteration>()); } PB_DS_CLASS_T_DEC @@ -208,19 +208,19 @@ rev_it_assign() reverse_iteration = container_traits::reverse_iteration }; - rev_it_assign_imp(pb_ds::detail::integral_constant<int,reverse_iteration>()); + rev_it_assign_imp(__gnu_pbds::detail::integral_constant<int,reverse_iteration>()); } PB_DS_CLASS_T_DEC void PB_DS_CLASS_C_DEC:: -rev_it_copy_imp(pb_ds::detail::false_type) +rev_it_copy_imp(__gnu_pbds::detail::false_type) { } PB_DS_CLASS_T_DEC void PB_DS_CLASS_C_DEC:: -rev_it_copy_imp(pb_ds::detail::true_type) +rev_it_copy_imp(__gnu_pbds::detail::true_type) { { typename cntnr::iterator it = m_p_c->end(); @@ -260,13 +260,13 @@ rev_it_copy_imp(pb_ds::detail::true_type) PB_DS_CLASS_T_DEC void PB_DS_CLASS_C_DEC:: -rev_it_assign_imp(pb_ds::detail::false_type) +rev_it_assign_imp(__gnu_pbds::detail::false_type) { } PB_DS_CLASS_T_DEC void PB_DS_CLASS_C_DEC:: -rev_it_assign_imp(pb_ds::detail::true_type) +rev_it_assign_imp(__gnu_pbds::detail::true_type) { { typename cntnr::iterator it = m_p_c->end(); diff --git a/libstdc++-v3/testsuite/util/regression/rand/assoc/detail/policy_access_fn_imps.hpp b/libstdc++-v3/testsuite/util/regression/rand/assoc/detail/policy_access_fn_imps.hpp index 7ffd18a77dc..9b4f0927f6f 100644 --- a/libstdc++-v3/testsuite/util/regression/rand/assoc/detail/policy_access_fn_imps.hpp +++ b/libstdc++-v3/testsuite/util/regression/rand/assoc/detail/policy_access_fn_imps.hpp @@ -55,7 +55,7 @@ policy_access() PB_DS_CLASS_T_DEC void PB_DS_CLASS_C_DEC:: -policy_access(pb_ds::basic_hash_tag) +policy_access(__gnu_pbds::basic_hash_tag) { { typename Cntnr::hash_fn& r_t = @@ -97,9 +97,9 @@ policy_access(pb_ds::basic_hash_tag) PB_DS_CLASS_T_DEC void PB_DS_CLASS_C_DEC:: -policy_access(pb_ds::cc_hash_tag) +policy_access(__gnu_pbds::cc_hash_tag) { - policy_access(pb_ds::basic_hash_tag()); + policy_access(__gnu_pbds::basic_hash_tag()); { typename Cntnr::comb_hash_fn& r_t = @@ -117,9 +117,9 @@ policy_access(pb_ds::cc_hash_tag) PB_DS_CLASS_T_DEC void PB_DS_CLASS_C_DEC:: -policy_access(pb_ds::gp_hash_tag) +policy_access(__gnu_pbds::gp_hash_tag) { - policy_access(pb_ds::basic_hash_tag()); + policy_access(__gnu_pbds::basic_hash_tag()); { typename Cntnr::comb_probe_fn& r_t = @@ -149,7 +149,7 @@ policy_access(pb_ds::gp_hash_tag) PB_DS_CLASS_T_DEC void PB_DS_CLASS_C_DEC:: -policy_access(pb_ds::tree_tag) +policy_access(__gnu_pbds::tree_tag) { { typename Cntnr::cmp_fn& r_t = @@ -168,13 +168,13 @@ policy_access(pb_ds::tree_tag) PB_DS_CLASS_T_DEC void PB_DS_CLASS_C_DEC:: -policy_access(pb_ds::list_update_tag) +policy_access(__gnu_pbds::list_update_tag) { } PB_DS_CLASS_T_DEC void PB_DS_CLASS_C_DEC:: -policy_access(pb_ds::pat_trie_tag) +policy_access(__gnu_pbds::pat_trie_tag) { typename Cntnr::e_access_traits& r_t = m_p_c->get_e_access_traits(); diff --git a/libstdc++-v3/testsuite/util/regression/rand/assoc/detail/resize_fn_imps.hpp b/libstdc++-v3/testsuite/util/regression/rand/assoc/detail/resize_fn_imps.hpp index 6f5ee79fdd4..77bfcb84c39 100644 --- a/libstdc++-v3/testsuite/util/regression/rand/assoc/detail/resize_fn_imps.hpp +++ b/libstdc++-v3/testsuite/util/regression/rand/assoc/detail/resize_fn_imps.hpp @@ -49,7 +49,7 @@ bool PB_DS_CLASS_C_DEC:: resize() { - typedef pb_ds::detail::integral_constant<int, test_traits::resize> resize_ind; + typedef __gnu_pbds::detail::integral_constant<int, test_traits::resize> resize_ind; return (resize_imp(resize_ind())); } @@ -57,7 +57,7 @@ resize() PB_DS_CLASS_T_DEC bool PB_DS_CLASS_C_DEC:: -resize_imp(pb_ds::detail::false_type) +resize_imp(__gnu_pbds::detail::false_type) { return (true); } @@ -65,7 +65,7 @@ resize_imp(pb_ds::detail::false_type) PB_DS_CLASS_T_DEC bool PB_DS_CLASS_C_DEC:: -resize_imp(pb_ds::detail::true_type) +resize_imp(__gnu_pbds::detail::true_type) { PB_DS_TRACE("resize"); diff --git a/libstdc++-v3/testsuite/util/regression/rand/assoc/detail/split_join_fn_imps.hpp b/libstdc++-v3/testsuite/util/regression/rand/assoc/detail/split_join_fn_imps.hpp index 073fda5666b..8026d7cc200 100644 --- a/libstdc++-v3/testsuite/util/regression/rand/assoc/detail/split_join_fn_imps.hpp +++ b/libstdc++-v3/testsuite/util/regression/rand/assoc/detail/split_join_fn_imps.hpp @@ -54,13 +54,13 @@ split_join() split_join = container_traits::order_preserving }; - return (split_join_imp(pb_ds::detail::integral_constant<int,split_join>())); + return (split_join_imp(__gnu_pbds::detail::integral_constant<int,split_join>())); } PB_DS_CLASS_T_DEC bool PB_DS_CLASS_C_DEC:: -split_join_imp(pb_ds::detail::false_type) +split_join_imp(__gnu_pbds::detail::false_type) { return (true); } @@ -68,7 +68,7 @@ split_join_imp(pb_ds::detail::false_type) PB_DS_CLASS_T_DEC bool PB_DS_CLASS_C_DEC:: -split_join_imp(pb_ds::detail::true_type) +split_join_imp(__gnu_pbds::detail::true_type) { PB_DS_TRACE("split_join"); diff --git a/libstdc++-v3/testsuite/util/regression/rand/assoc/detail/subscript_fn_imps.hpp b/libstdc++-v3/testsuite/util/regression/rand/assoc/detail/subscript_fn_imps.hpp index a2c59e12592..e627595d728 100644 --- a/libstdc++-v3/testsuite/util/regression/rand/assoc/detail/subscript_fn_imps.hpp +++ b/libstdc++-v3/testsuite/util/regression/rand/assoc/detail/subscript_fn_imps.hpp @@ -53,18 +53,18 @@ subscript() enum { - no_data = pb_ds::detail::is_same< + no_data = __gnu_pbds::detail::is_same< typename Cntnr::const_key_reference, typename Cntnr::const_reference>::value }; - return (subscript_imp(pb_ds::detail::integral_constant<int,no_data>())); + return (subscript_imp(__gnu_pbds::detail::integral_constant<int,no_data>())); } PB_DS_CLASS_T_DEC bool PB_DS_CLASS_C_DEC:: -subscript_imp(pb_ds::detail::false_type) +subscript_imp(__gnu_pbds::detail::false_type) { bool done = true; @@ -97,7 +97,7 @@ subscript_imp(pb_ds::detail::false_type) PB_DS_CLASS_T_DEC bool PB_DS_CLASS_C_DEC:: -subscript_imp(pb_ds::detail::true_type) +subscript_imp(__gnu_pbds::detail::true_type) { bool done = true; @@ -110,7 +110,7 @@ subscript_imp(pb_ds::detail::true_type) value_type v = test_traits::generate_value(m_g, m_m); m_alloc.set_throw_prob(m_tp); - (*m_p_c)[v] = pb_ds::null_mapped_type(); + (*m_p_c)[v] = __gnu_pbds::null_mapped_type(); m_native_c.insert(test_traits::native_value(v)); } diff --git a/libstdc++-v3/testsuite/util/regression/rand/assoc/rand_regression_test.hpp b/libstdc++-v3/testsuite/util/regression/rand/assoc/rand_regression_test.hpp index 2081c7c8b2d..2f79df56dce 100644 --- a/libstdc++-v3/testsuite/util/regression/rand/assoc/rand_regression_test.hpp +++ b/libstdc++-v3/testsuite/util/regression/rand/assoc/rand_regression_test.hpp @@ -55,7 +55,7 @@ #include <regression/basic_type.hpp> #include <regression/assoc/common_type.hpp> -namespace pb_ds +namespace __gnu_pbds { namespace test { @@ -123,7 +123,7 @@ namespace detail { detail::verify_params(sd, n, m, tp, ip, ep, cp, mp, disp); } - catch (pb_ds::test::illegal_input_error&) + catch (__gnu_pbds::test::illegal_input_error&) { detail::usage(name); return -1; @@ -205,6 +205,6 @@ namespace detail } } // namespace detail } // namespace test -} // namespace pb_ds +} // namespace __gnu_pbds #endif diff --git a/libstdc++-v3/testsuite/util/regression/rand/io/assoc/xml_formatter.hpp b/libstdc++-v3/testsuite/util/regression/rand/io/assoc/xml_formatter.hpp index d5e1f5ba3a4..db9ed28efb8 100644 --- a/libstdc++-v3/testsuite/util/regression/rand/io/assoc/xml_formatter.hpp +++ b/libstdc++-v3/testsuite/util/regression/rand/io/assoc/xml_formatter.hpp @@ -49,7 +49,7 @@ #include <regression/rand/io/xml_formatter.hpp> -namespace pb_ds +namespace __gnu_pbds { namespace test @@ -76,6 +76,6 @@ namespace pb_ds } // namespace test -} // namespace pb_ds +} // namespace __gnu_pbds #endif // #ifndef PB_DS_XML_TEST_REGRESSION_FORMATTER_HPP diff --git a/libstdc++-v3/testsuite/util/regression/rand/io/priority_queue/xml_formatter.hpp b/libstdc++-v3/testsuite/util/regression/rand/io/priority_queue/xml_formatter.hpp index a8ceab4d2ee..af6f5d242b9 100644 --- a/libstdc++-v3/testsuite/util/regression/rand/io/priority_queue/xml_formatter.hpp +++ b/libstdc++-v3/testsuite/util/regression/rand/io/priority_queue/xml_formatter.hpp @@ -49,7 +49,7 @@ #include <regression/rand/io/xml_formatter.hpp> -namespace pb_ds +namespace __gnu_pbds { namespace test @@ -77,6 +77,6 @@ namespace pb_ds } // namespace test -} // namespace pb_ds +} // namespace __gnu_pbds #endif // #ifndef PB_DS_XML_TEST_REGRESSION_FORMATTER_HPP diff --git a/libstdc++-v3/testsuite/util/regression/rand/io/xml_formatter.hpp b/libstdc++-v3/testsuite/util/regression/rand/io/xml_formatter.hpp index 6bc89976c58..7006618bd47 100644 --- a/libstdc++-v3/testsuite/util/regression/rand/io/xml_formatter.hpp +++ b/libstdc++-v3/testsuite/util/regression/rand/io/xml_formatter.hpp @@ -51,7 +51,7 @@ #include <iostream> #include <io/xml_test_formatter.hpp> -namespace pb_ds +namespace __gnu_pbds { namespace test @@ -82,6 +82,6 @@ namespace pb_ds } // namespace test -} // namespace pb_ds +} // namespace __gnu_pbds #endif // #ifndef PB_DS_COMMON_XML_TEST_REGRESSION_FORMATTER_HPP diff --git a/libstdc++-v3/testsuite/util/regression/rand/priority_queue/container_rand_regression_test.hpp b/libstdc++-v3/testsuite/util/regression/rand/priority_queue/container_rand_regression_test.hpp index 15ff02bba11..eeedc27bdca 100644 --- a/libstdc++-v3/testsuite/util/regression/rand/priority_queue/container_rand_regression_test.hpp +++ b/libstdc++-v3/testsuite/util/regression/rand/priority_queue/container_rand_regression_test.hpp @@ -60,7 +60,7 @@ #include <regression/rand/io/priority_queue/xml_formatter.hpp> #include <regression/trait/priority_queue/trait.hpp> -namespace pb_ds +namespace __gnu_pbds { namespace test @@ -329,6 +329,6 @@ namespace pb_ds } // namespace test -} // namespace pb_ds +} // namespace __gnu_pbds #endif // #ifndef PB_DS_CONTAINER_RAND_REGRESSION_TEST_HPP diff --git a/libstdc++-v3/testsuite/util/regression/rand/priority_queue/detail/split_join_fn_imps.hpp b/libstdc++-v3/testsuite/util/regression/rand/priority_queue/detail/split_join_fn_imps.hpp index 41c302718fe..b25394fa34d 100644 --- a/libstdc++-v3/testsuite/util/regression/rand/priority_queue/detail/split_join_fn_imps.hpp +++ b/libstdc++-v3/testsuite/util/regression/rand/priority_queue/detail/split_join_fn_imps.hpp @@ -109,7 +109,7 @@ split_join() { done = false; - PB_DS_THROW_IF_FAILED( pb_ds::container_traits<cntnr>::split_join_can_throw, pb_ds::container_traits<cntnr>::split_join_can_throw, m_p_c, & m_native_c); + PB_DS_THROW_IF_FAILED( __gnu_pbds::container_traits<cntnr>::split_join_can_throw, __gnu_pbds::container_traits<cntnr>::split_join_can_throw, m_p_c, & m_native_c); } PB_DS_COND_COMPARE(*m_p_c, m_native_c); diff --git a/libstdc++-v3/testsuite/util/regression/rand/priority_queue/rand_regression_test.hpp b/libstdc++-v3/testsuite/util/regression/rand/priority_queue/rand_regression_test.hpp index 0d4c960fb85..80f941a6db9 100644 --- a/libstdc++-v3/testsuite/util/regression/rand/priority_queue/rand_regression_test.hpp +++ b/libstdc++-v3/testsuite/util/regression/rand/priority_queue/rand_regression_test.hpp @@ -55,7 +55,7 @@ #include <regression/basic_type.hpp> #include <regression/priority_queue/common_type.hpp> -namespace pb_ds +namespace __gnu_pbds { namespace test { @@ -125,7 +125,7 @@ namespace detail { detail::verify_params(sd, n, m, tp, ip, dp, ep, cp, mp, disp); } - catch(pb_ds::test::illegal_input_error&) + catch(__gnu_pbds::test::illegal_input_error&) { detail::usage(name); return -1; @@ -209,6 +209,6 @@ namespace detail } } // namespace detail } // namespace test -} // namespace pb_ds +} // namespace __gnu_pbds #endif diff --git a/libstdc++-v3/testsuite/util/regression/trait/assoc/get_set_load_trait.hpp b/libstdc++-v3/testsuite/util/regression/trait/assoc/get_set_load_trait.hpp index dac0c7f4719..a796b81b732 100644 --- a/libstdc++-v3/testsuite/util/regression/trait/assoc/get_set_load_trait.hpp +++ b/libstdc++-v3/testsuite/util/regression/trait/assoc/get_set_load_trait.hpp @@ -50,7 +50,7 @@ #include <ext/pb_ds/assoc_container.hpp> -namespace pb_ds +namespace __gnu_pbds { namespace test @@ -80,14 +80,14 @@ namespace pb_ds template<typename Cntnr> struct regression_test_get_set_load_traits< Cntnr, - pb_ds::cc_hash_tag> : public regression_test_hash_get_set_load_traits< + __gnu_pbds::cc_hash_tag> : public regression_test_hash_get_set_load_traits< Cntnr> { }; template<typename Cntnr> struct regression_test_get_set_load_traits< Cntnr, - pb_ds::gp_hash_tag> : public regression_test_hash_get_set_load_traits< + __gnu_pbds::gp_hash_tag> : public regression_test_hash_get_set_load_traits< Cntnr> { }; @@ -95,6 +95,6 @@ namespace pb_ds } // namespace test -} // namespace pb_ds +} // namespace __gnu_pbds #endif // #ifndef PB_DS_REGRESSION_TEST_SET_LOAD_TRAIT_HPP diff --git a/libstdc++-v3/testsuite/util/regression/trait/assoc/get_set_loads_trait.hpp b/libstdc++-v3/testsuite/util/regression/trait/assoc/get_set_loads_trait.hpp index 17c872ee83e..389ad6467fe 100644 --- a/libstdc++-v3/testsuite/util/regression/trait/assoc/get_set_loads_trait.hpp +++ b/libstdc++-v3/testsuite/util/regression/trait/assoc/get_set_loads_trait.hpp @@ -50,7 +50,7 @@ #include <ext/pb_ds/assoc_container.hpp> -namespace pb_ds +namespace __gnu_pbds { namespace test @@ -80,14 +80,14 @@ namespace pb_ds template<typename Cntnr> struct regression_test_get_set_loacontainer_traits< Cntnr, - pb_ds::cc_hash_tag> : public regression_test_hash_get_set_loacontainer_traits< + __gnu_pbds::cc_hash_tag> : public regression_test_hash_get_set_loacontainer_traits< Cntnr> { }; template<typename Cntnr> struct regression_test_get_set_loacontainer_traits< Cntnr, - pb_ds::gp_hash_tag> : public regression_test_hash_get_set_loacontainer_traits< + __gnu_pbds::gp_hash_tag> : public regression_test_hash_get_set_loacontainer_traits< Cntnr> { }; @@ -95,6 +95,6 @@ namespace pb_ds } // namespace test -} // namespace pb_ds +} // namespace __gnu_pbds #endif // #ifndef PB_DS_REGRESSION_TEST_SET_LOADS_TRAIT_HPP diff --git a/libstdc++-v3/testsuite/util/regression/trait/assoc/native_type_trait.hpp b/libstdc++-v3/testsuite/util/regression/trait/assoc/native_type_trait.hpp index 1c65c6c81f8..d70c88339dd 100644 --- a/libstdc++-v3/testsuite/util/regression/trait/assoc/native_type_trait.hpp +++ b/libstdc++-v3/testsuite/util/regression/trait/assoc/native_type_trait.hpp @@ -48,7 +48,7 @@ #ifndef PB_DS_REGRESSION_TEST_NATIVE_TYPE_TRAIT_HPP #define PB_DS_REGRESSION_TEST_NATIVE_TYPE_TRAIT_HPP -namespace pb_ds +namespace __gnu_pbds { namespace test @@ -133,7 +133,7 @@ namespace pb_ds struct native_type_traits_base< Native_Key_Type, Key_Type, - pb_ds::null_mapped_type, + __gnu_pbds::null_mapped_type, Allocator> { public: @@ -190,6 +190,6 @@ namespace pb_ds } // namespace test -} // namespace pb_ds +} // namespace __gnu_pbds #endif // #ifndef PB_DS_REGRESSION_TEST_NATIVE_TYPE_TRAIT_HPP diff --git a/libstdc++-v3/testsuite/util/regression/trait/assoc/node_update_trait.hpp b/libstdc++-v3/testsuite/util/regression/trait/assoc/node_update_trait.hpp index 9f235116ecb..ff3004279f4 100644 --- a/libstdc++-v3/testsuite/util/regression/trait/assoc/node_update_trait.hpp +++ b/libstdc++-v3/testsuite/util/regression/trait/assoc/node_update_trait.hpp @@ -53,7 +53,7 @@ #include <common_type/assoc/detail/trie_supports_order_statistics.hpp> #include <common_type/assoc/detail/trie_supports_prefix_search.hpp> -namespace pb_ds +namespace __gnu_pbds { namespace test @@ -75,7 +75,7 @@ namespace pb_ds template<typename Cntnr> struct regression_test_node_update_traits< Cntnr, - pb_ds::pat_trie_tag> + __gnu_pbds::pat_trie_tag> { enum { @@ -89,7 +89,7 @@ namespace pb_ds template<typename Cntnr> struct regression_test_node_update_traits< Cntnr, - pb_ds::rb_tree_tag> + __gnu_pbds::rb_tree_tag> { enum { @@ -102,7 +102,7 @@ namespace pb_ds template<typename Cntnr> struct regression_test_node_update_traits< Cntnr, - pb_ds::splay_tree_tag> + __gnu_pbds::splay_tree_tag> { enum { @@ -115,7 +115,7 @@ namespace pb_ds template<typename Cntnr> struct regression_test_node_update_traits< Cntnr, - pb_ds::ov_tree_tag> + __gnu_pbds::ov_tree_tag> { enum { @@ -129,6 +129,6 @@ namespace pb_ds } // namespace test -} // namespace pb_ds +} // namespace __gnu_pbds #endif // #ifndef PB_DS_REGRESSION_TEST_NODE_UPDATOR_TRAIT_HPP diff --git a/libstdc++-v3/testsuite/util/regression/trait/assoc/resize_trait.hpp b/libstdc++-v3/testsuite/util/regression/trait/assoc/resize_trait.hpp index 24ee05b15c5..932a0ccbc1a 100644 --- a/libstdc++-v3/testsuite/util/regression/trait/assoc/resize_trait.hpp +++ b/libstdc++-v3/testsuite/util/regression/trait/assoc/resize_trait.hpp @@ -50,7 +50,7 @@ #include <ext/pb_ds/assoc_container.hpp> -namespace pb_ds +namespace __gnu_pbds { namespace test @@ -80,14 +80,14 @@ namespace pb_ds template<typename Cntnr> struct regression_test_resize_traits< Cntnr, - pb_ds::cc_hash_tag> : public regression_test_hash_resize_traits< + __gnu_pbds::cc_hash_tag> : public regression_test_hash_resize_traits< Cntnr> { }; template<typename Cntnr> struct regression_test_resize_traits< Cntnr, - pb_ds::gp_hash_tag> : public regression_test_hash_resize_traits< + __gnu_pbds::gp_hash_tag> : public regression_test_hash_resize_traits< Cntnr> { }; @@ -95,6 +95,6 @@ namespace pb_ds } // namespace test -} // namespace pb_ds +} // namespace __gnu_pbds #endif // #ifndef PB_DS_REGRESSION_TEST_RESIZE_TRAIT_HPP diff --git a/libstdc++-v3/testsuite/util/regression/trait/assoc/to_string.hpp b/libstdc++-v3/testsuite/util/regression/trait/assoc/to_string.hpp index d07b330cadb..a0ba69388a2 100644 --- a/libstdc++-v3/testsuite/util/regression/trait/assoc/to_string.hpp +++ b/libstdc++-v3/testsuite/util/regression/trait/assoc/to_string.hpp @@ -50,7 +50,7 @@ #include <regression/basic_type.hpp> #include <string> -namespace pb_ds +namespace __gnu_pbds { namespace test @@ -86,6 +86,6 @@ namespace pb_ds } // namespace test -} // namespace pb_ds +} // namespace __gnu_pbds #endif // #ifndef PB_DS_REGRESSION_TEST_TO_STRING_HPP diff --git a/libstdc++-v3/testsuite/util/regression/trait/assoc/trait.hpp b/libstdc++-v3/testsuite/util/regression/trait/assoc/trait.hpp index 9f571107df0..e8791a4472a 100644 --- a/libstdc++-v3/testsuite/util/regression/trait/assoc/trait.hpp +++ b/libstdc++-v3/testsuite/util/regression/trait/assoc/trait.hpp @@ -57,7 +57,7 @@ #include <regression/trait/assoc/node_update_trait.hpp> #include <regression/trait/erase_if_fn.hpp> -namespace pb_ds +namespace __gnu_pbds { namespace test { @@ -214,6 +214,6 @@ namespace detail } // namespace detail } // namespace test -} // namespace pb_ds +} // namespace __gnu_pbds #endif diff --git a/libstdc++-v3/testsuite/util/regression/trait/assoc/type_trait.hpp b/libstdc++-v3/testsuite/util/regression/trait/assoc/type_trait.hpp index df8b66fcbc8..5c0682de38f 100644 --- a/libstdc++-v3/testsuite/util/regression/trait/assoc/type_trait.hpp +++ b/libstdc++-v3/testsuite/util/regression/trait/assoc/type_trait.hpp @@ -50,7 +50,7 @@ #include <regression/basic_type.hpp> -namespace pb_ds +namespace __gnu_pbds { namespace test { @@ -92,7 +92,7 @@ namespace pb_ds template<typename Gen> static value_type - generate_value(Gen& r_gen, size_t max, pb_ds::null_mapped_type) + generate_value(Gen& r_gen, size_t max, __gnu_pbds::null_mapped_type) { return basic_type(r_gen, max); } template<typename Gen> @@ -116,6 +116,6 @@ namespace pb_ds }; } // namespace detail } // namespace test -} // namespace pb_ds +} // namespace __gnu_pbds #endif diff --git a/libstdc++-v3/testsuite/util/regression/trait/erase_if_fn.hpp b/libstdc++-v3/testsuite/util/regression/trait/erase_if_fn.hpp index c583848c630..41618a6843e 100644 --- a/libstdc++-v3/testsuite/util/regression/trait/erase_if_fn.hpp +++ b/libstdc++-v3/testsuite/util/regression/trait/erase_if_fn.hpp @@ -50,7 +50,7 @@ #include <functional> -namespace pb_ds +namespace __gnu_pbds { namespace test { @@ -90,6 +90,6 @@ namespace pb_ds }; } // namespace detail } // namespace test -} // namespace pb_ds +} // namespace __gnu_pbds #endif diff --git a/libstdc++-v3/testsuite/util/regression/trait/priority_queue/trait.hpp b/libstdc++-v3/testsuite/util/regression/trait/priority_queue/trait.hpp index 641d9295cfb..f2875105649 100644 --- a/libstdc++-v3/testsuite/util/regression/trait/priority_queue/trait.hpp +++ b/libstdc++-v3/testsuite/util/regression/trait/priority_queue/trait.hpp @@ -50,7 +50,7 @@ #include <regression/trait/erase_if_fn.hpp> -namespace pb_ds +namespace __gnu_pbds { namespace test { @@ -61,7 +61,7 @@ namespace pb_ds { typedef typename Cntnr::value_type value_type; typedef typename Cntnr::const_reference const_reference; - typedef pb_ds::test::native_priority_queue<std::string, true> native_type; + typedef __gnu_pbds::test::native_priority_queue<std::string, true> native_type; typedef typename native_type::value_type native_value_type; template<typename T> @@ -87,6 +87,6 @@ namespace pb_ds }; } // namespace detail } // namespace test -} // namespace pb_ds +} // namespace __gnu_pbds #endif |