On dev: MIchaelList

[libcds.git] / tests / test-hdr / ordered_list / hdr_intrusive_michael_list_rcu_gpt.cpp

diff --git a/tests/test-hdr/ordered_list/hdr_intrusive_michael_list_rcu_gpt.cpp b/tests/test-hdr/ordered_list/hdr_intrusive_michael_list_rcu_gpt.cpp
index 27e400da58a913f80060d106562265046add75e2..4f8d7f36a4ba4daae1c51c614519bf7e58a4f57c 100644 (file)
--- a/tests/test-hdr/ordered_list/hdr_intrusive_michael_list_rcu_gpt.cpp
+++ b/tests/test-hdr/ordered_list/hdr_intrusive_michael_list_rcu_gpt.cpp
@@ -12,27 +12,25 @@ namespace ordlist {
     void IntrusiveMichaelListHeaderTest::RCU_GPT_base_cmp()
     {
         typedef base_int_item< RCU > item;
-        typedef ci::MichaelList< RCU
-            ,item
-            ,ci::michael_list::make_traits<
-                ci::opt::hook< ci::michael_list::base_hook< co::gc<RCU> > >
-                ,co::compare< cmp<item> >
-                ,ci::opt::disposer< faked_disposer >
-            >::type
-        >    list;
+        struct traits : public ci::michael_list::traits
+        {
+            typedef ci::michael_list::base_hook< co::gc<RCU> > hook;
+            typedef cmp<item> compare;
+            typedef faked_disposer disposer;
+        };
+        typedef ci::MichaelList< RCU, item, traits > list;
         test_rcu_int<list>();
     }
     void IntrusiveMichaelListHeaderTest::RCU_GPT_base_less()
     {
         typedef base_int_item< RCU > item;
-        typedef ci::MichaelList< RCU
-            ,item
-            ,ci::michael_list::make_traits<
-                ci::opt::hook< ci::michael_list::base_hook< co::gc<RCU> > >
-                ,co::less< less<item> >
-                ,ci::opt::disposer< faked_disposer >
-            >::type
-        >    list;
+        struct traits : public ci::michael_list::traits
+        {
+            typedef ci::michael_list::base_hook< co::gc<RCU> > hook;
+            typedef IntrusiveMichaelListHeaderTest::less<item> less;
+            typedef faked_disposer disposer;
+        };
+        typedef ci::MichaelList< RCU, item, traits > list;
         test_rcu_int<list>();
     }
     void IntrusiveMichaelListHeaderTest::RCU_GPT_base_cmpmix()