On dev: MIchaelList

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

diff --git a/tests/test-hdr/ordered_list/hdr_intrusive_michael_nogc.cpp b/tests/test-hdr/ordered_list/hdr_intrusive_michael_nogc.cpp
index aeefabb1c865432d618e29b922e95c2767744814..81f97104311f30ed3c3c158f4e7190f3a83a1a29 100644 (file)
--- a/tests/test-hdr/ordered_list/hdr_intrusive_michael_nogc.cpp
+++ b/tests/test-hdr/ordered_list/hdr_intrusive_michael_nogc.cpp
@@ -7,27 +7,25 @@ namespace ordlist {
     void IntrusiveMichaelListHeaderTest::nogc_base_cmp()
     {
         typedef base_int_item< cds::gc::nogc > item;
-        typedef ci::MichaelList< cds::gc::nogc
-            ,item
-            ,ci::michael_list::make_traits<
-                ci::opt::hook< ci::michael_list::base_hook< co::gc<cds::gc::nogc> > >
-                ,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<cds::gc::nogc> > hook;
+            typedef cmp<item> compare;
+            typedef faked_disposer disposer;
+        };
+        typedef ci::MichaelList< cds::gc::nogc, item, traits > list;
         test_nogc_int<list>();
     }
     void IntrusiveMichaelListHeaderTest::nogc_base_less()
     {
         typedef base_int_item< cds::gc::nogc > item;
-        typedef ci::MichaelList< cds::gc::nogc
-            ,item
-            ,ci::michael_list::make_traits<
-                ci::opt::hook< ci::michael_list::base_hook< co::gc<cds::gc::nogc> > >
-                ,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<cds::gc::nogc> > hook;
+            typedef IntrusiveMichaelListHeaderTest::less<item> less;
+            typedef faked_disposer disposer;
+        };
+        typedef ci::MichaelList< cds::gc::nogc, item, traits > list;
         test_nogc_int<list>();
     }
     void IntrusiveMichaelListHeaderTest::nogc_base_cmpmix()