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

[libcds.git] / test / unit / queue / segmented_queue_dhp.cpp

diff --git a/test/unit/queue/segmented_queue_dhp.cpp b/test/unit/queue/segmented_queue_dhp.cpp
index e623939360ce9ff2ad70a0df6f865ec060e2477a..8280f58de4306bca012443b1b35cc681a668b684 100644 (file)
--- a/test/unit/queue/segmented_queue_dhp.cpp
+++ b/test/unit/queue/segmented_queue_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/
@@ -46,14 +46,14 @@ namespace {
         {
             typedef cc::SegmentedQueue< gc_type, int > queue_type;
 
-            cds::gc::dhp::GarbageCollector::Construct( 16, queue_type::c_nHazardPtrCount );
+            cds::gc::dhp::smr::construct( queue_type::c_nHazardPtrCount );
             cds::threading::Manager::attachThread();
         }
 
         void TearDown()
         {
             cds::threading::Manager::detachThread();
-            cds::gc::dhp::GarbageCollector::Destruct();
+            cds::gc::dhp::smr::destruct();
         }
     };
 
@@ -76,7 +76,7 @@ namespace {
         typedef cds::container::SegmentedQueue< gc_type, int, traits > test_queue;
 
         test_queue q( c_QuasiFactor );
-        ASSERT_EQ( q.quasi_factor(), cds::beans::ceil2( c_QuasiFactor ) );
+        ASSERT_EQ( q.quasi_factor(), cds::beans::ceil2( c_QuasiFactor ));
         test( q );
     }
 
@@ -90,7 +90,7 @@ namespace {
         typedef cds::container::SegmentedQueue< gc_type, int, traits > test_queue;
 
         test_queue q( c_QuasiFactor );
-        ASSERT_EQ( q.quasi_factor(), cds::beans::ceil2( c_QuasiFactor ) );
+        ASSERT_EQ( q.quasi_factor(), cds::beans::ceil2( c_QuasiFactor ));
         test( q );
     }
 
@@ -106,7 +106,7 @@ namespace {
         typedef cds::container::SegmentedQueue< gc_type, int, traits > test_queue;
 
         test_queue q( c_QuasiFactor );
-        ASSERT_EQ( q.quasi_factor(), cds::beans::ceil2( c_QuasiFactor ) );
+        ASSERT_EQ( q.quasi_factor(), cds::beans::ceil2( c_QuasiFactor ));
         test( q );
     }
 
@@ -115,7 +115,7 @@ namespace {
         typedef cds::container::SegmentedQueue< gc_type, std::string > test_queue;
 
         test_queue q( c_QuasiFactor );
-        ASSERT_EQ( q.quasi_factor(), cds::beans::ceil2( c_QuasiFactor ) );
+        ASSERT_EQ( q.quasi_factor(), cds::beans::ceil2( c_QuasiFactor ));
         test_string( q );
     }
 
@@ -128,7 +128,7 @@ namespace {
         typedef cds::container::SegmentedQueue< gc_type, std::string, traits > test_queue;
 
         test_queue q( c_QuasiFactor );
-        ASSERT_EQ( q.quasi_factor(), cds::beans::ceil2( c_QuasiFactor ) );
+        ASSERT_EQ( q.quasi_factor(), cds::beans::ceil2( c_QuasiFactor ));
         test_string( q );
     }