2008-06-06 Benjamin Kosnik <bkoz@redhat.com>

[pf3gnuchains/gcc-fork.git] / libstdc++-v3 / testsuite / performance / ext / pb_ds / tree_order_statistics_timing.cc

diff --git a/libstdc++-v3/testsuite/performance/ext/pb_ds/tree_order_statistics_timing.cc b/libstdc++-v3/testsuite/performance/ext/pb_ds/tree_order_statistics_timing.cc
index 2af32f3..da1dda8 100644 (file)
--- a/libstdc++-v3/testsuite/performance/ext/pb_ds/tree_order_statistics_timing.cc
+++ b/libstdc++-v3/testsuite/performance/ext/pb_ds/tree_order_statistics_timing.cc
@@ -46,12 +46,11 @@
 
 #include <iostream>
 #include <vector>
-#include <ext/pb_ds/detail/typelist.hpp>
+#include <ext/typelist.h>
 #include <performance/io/xml_formatter.hpp>
 #include <io/verified_cmd_line_input.hpp>
-#include <rng/twister_rand_gen.hpp>
+#include <testsuite_rng.h>
 #include <common_type/assoc/common_type.hpp>
-#include <ext/pb_ds/detail/typelist.hpp>
 #include <performance/assoc/timing/tree_order_statistics_test.hpp>
 
 void
@@ -60,7 +59,7 @@ usage();
 int
 main(int argc, char* a_p_argv[])
 {
-  using namespace pb_ds::test;
+  using namespace __gnu_pbds::test;
   size_t vn = 200;
   size_t vs = 200;
   size_t vm = 2100;
@@ -72,16 +71,16 @@ main(int argc, char* a_p_argv[])
       {
        typedef tree_order_statistics_test< true> test_t;
        test_t tst(vn, vs, vm);
-       typedef tree_common_types<int, pb_ds::null_mapped_type, std::less<int>, pb_ds::tree_order_statistics_node_update>::performance_tl tl_t;
+       typedef tree_common_types<int, __gnu_pbds::null_mapped_type, std::less<int>, __gnu_pbds::tree_order_statistics_node_update>::performance_tl tl_t;
        tl_t tl;
-       pb_ds::detail::typelist_apply(tst, tl);
+       __gnu_cxx::typelist::apply(tst, tl);
       }
 
       {
        typedef tree_order_statistics_test<false> test_t;
        test_t tst(vn, vs, vm);
        typedef native_set<int> native_set_t;
-       tst(pb_ds::detail::type_to_type<native_set_t>());
+       tst(native_set_t());
       }
     }
   catch(...)