On dev: MIchaelList

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

diff --git a/tests/test-hdr/ordered_list/hdr_intrusive_michael_list_rcu_gpi.cpp b/tests/test-hdr/ordered_list/hdr_intrusive_michael_list_rcu_gpi.cpp
index 3ed41ee0accb6de6c43c26aa12892419577fe346..7953a1c4e0c9b6415d6d0a519b4172f94bb5be45 100644 (file)
--- a/tests/test-hdr/ordered_list/hdr_intrusive_michael_list_rcu_gpi.cpp
+++ b/tests/test-hdr/ordered_list/hdr_intrusive_michael_list_rcu_gpi.cpp
@@ -12,27 +12,25 @@ namespace ordlist {
     void IntrusiveMichaelListHeaderTest::RCU_GPI_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_GPI_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_GPI_base_cmpmix()