Merge branch 'flat_combinig_add_stress_and_unint_tests' of https://github.com/mgalimu...

[libcds.git] / test / unit / set / split_michael_dhp.cpp

diff --git a/test/unit/set/split_michael_dhp.cpp b/test/unit/set/split_michael_dhp.cpp
index 41a950e7e53d84f757675aa1c7e2d3635444bc20..ebf3df72c4a7475aeab2dff8830ad6ff4f2630ad 100644 (file)
--- a/test/unit/set/split_michael_dhp.cpp
+++ b/test/unit/set/split_michael_dhp.cpp
@@ -1,7 +1,7 @@
 /*
     This file is a part of libcds - Concurrent Data Structures library
 
-    (C) Copyright Maxim Khizhinsky (libcds.dev@gmail.com) 2006-2016
+    (C) Copyright Maxim Khizhinsky (libcds.dev@gmail.com) 2006-2017
 
     Source code repo: http://github.com/khizmax/libcds/
     Download: http://sourceforge.net/projects/libcds/files/
@@ -55,24 +55,24 @@ namespace {
             };
             typedef cc::SplitListSet< gc_type, int_item, set_traits >   set_type;
 
-            cds::gc::dhp::GarbageCollector::Construct( 16, set_type::c_nHazardPtrCount );
+            cds::gc::dhp::smr::construct( set_type::c_nHazardPtrCount );
             cds::threading::Manager::attachThread();
         }
 
         void TearDown()
         {
             cds::threading::Manager::detachThread();
-            cds::gc::dhp::GarbageCollector::Destruct();
+            cds::gc::dhp::smr::destruct();
         }
     };
 
     TEST_F( SplitListMichaelSet_DHP, compare )
     {
-        typedef cc::SplitListSet< gc_type, int_item, 
+        typedef cc::SplitListSet< gc_type, int_item,
             typename cc::split_list::make_traits<
                 cc::split_list::ordered_list< cc::michael_list_tag >
                 , cds::opt::hash< hash_int >
-                , cc::split_list::ordered_list_traits< 
+                , cc::split_list::ordered_list_traits<
                     typename cc::michael_list::make_traits<
                         cds::opt::compare< cmp >
                     >::type
@@ -86,11 +86,11 @@ namespace {
 
     TEST_F( SplitListMichaelSet_DHP, less )
     {
-        typedef cc::SplitListSet< gc_type, int_item, 
+        typedef cc::SplitListSet< gc_type, int_item,
             typename cc::split_list::make_traits<
                 cc::split_list::ordered_list< cc::michael_list_tag >
                 , cds::opt::hash< hash_int >
-                , cc::split_list::ordered_list_traits< 
+                , cc::split_list::ordered_list_traits<
                     typename cc::michael_list::make_traits<
                         cds::opt::less< less >
                     >::type
@@ -104,11 +104,11 @@ namespace {
 
     TEST_F( SplitListMichaelSet_DHP, cmpmix )
     {
-        typedef cc::SplitListSet< gc_type, int_item, 
+        typedef cc::SplitListSet< gc_type, int_item,
             typename cc::split_list::make_traits<
                 cc::split_list::ordered_list< cc::michael_list_tag >
                 , cds::opt::hash< hash_int >
-                , cc::split_list::ordered_list_traits< 
+                , cc::split_list::ordered_list_traits<
                     typename cc::michael_list::make_traits<
                         cds::opt::less< less >
                         , cds::opt::compare< cmp >