intrusive::EllenBinTree test refactoring

[libcds.git] / tests / test-hdr / tree / hdr_intrusive_ellen_bintree_rcu_gpb.cpp

diff --git a/tests/test-hdr/tree/hdr_intrusive_ellen_bintree_rcu_gpb.cpp b/tests/test-hdr/tree/hdr_intrusive_ellen_bintree_rcu_gpb.cpp
index 642f2222ef4d7b8cbcb2dafbe7da9a2fa8a2f72d..8843fb69d6159897fd0abd46e8c52ae87c1ccde7 100644 (file)
--- a/tests/test-hdr/tree/hdr_intrusive_ellen_bintree_rcu_gpb.cpp
+++ b/tests/test-hdr/tree/hdr_intrusive_ellen_bintree_rcu_gpb.cpp
@@ -30,14 +30,14 @@ namespace tree {
 
     void IntrusiveBinTreeHdrTest::EllenBinTree_rcu_gpb_base_less()
     {
-        typedef ci::EllenBinTree< rcu_type, key_type, base_value,
-            ci::ellen_bintree::make_traits<
-                ci::opt::hook< ci::ellen_bintree::base_hook< co::gc< rcu_type > > >
-                ,ci::ellen_bintree::key_extractor< key_extractor< base_value > >
-                ,co::less< less< base_value > >
-                ,ci::opt::disposer< disposer< base_value > >
-            >::type
-        > tree_type;
+        struct tree_traits : public ci::ellen_bintree::traits
+        {
+            typedef ci::ellen_bintree::base_hook< co::gc< rcu_type >> hook;
+            typedef IntrusiveBinTreeHdrTest::key_extractor< base_value > key_extractor;
+            typedef IntrusiveBinTreeHdrTest::less< base_value > less;
+            typedef IntrusiveBinTreeHdrTest::disposer< base_value > disposer;
+        };
+        typedef ci::EllenBinTree< rcu_type, key_type, base_value, tree_traits > tree_type;
 
         test_rcu<tree_type, print_stat>();
     }