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

[libcds.git] / test / unit / map / split_iterable_dhp.cpp

diff --git a/test/unit/map/split_iterable_dhp.cpp b/test/unit/map/split_iterable_dhp.cpp
index ee02acdea2d46406ad39236c3b496e26bb072e24..27f6d5ae9107455daa88acdba244d1e22092877e 100644 (file)
--- a/test/unit/map/split_iterable_dhp.cpp
+++ b/test/unit/map/split_iterable_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::SplitListMap< gc_type, key_type, value_type, map_traits >   map_type;
 
-            cds::gc::dhp::GarbageCollector::Construct( 16, map_type::c_nHazardPtrCount );
+            cds::gc::dhp::smr::construct( map_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( SplitListIterableMap_DHP, compare )
     {
-        typedef cc::SplitListMap< gc_type, key_type, value_type, 
+        typedef cc::SplitListMap< gc_type, key_type, value_type,
             typename cc::split_list::make_traits<
                 cc::split_list::ordered_list< cc::iterable_list_tag >
                 , cds::opt::hash< hash1 >
-                , cc::split_list::ordered_list_traits< 
+                , cc::split_list::ordered_list_traits<
                     typename cc::iterable_list::make_traits<
                         cds::opt::compare< cmp >
                     >::type
@@ -86,11 +86,11 @@ namespace {
 
     TEST_F( SplitListIterableMap_DHP, less )
     {
-        typedef cc::SplitListMap< gc_type, key_type, value_type, 
+        typedef cc::SplitListMap< gc_type, key_type, value_type,
             typename cc::split_list::make_traits<
                 cc::split_list::ordered_list< cc::iterable_list_tag >
                 , cds::opt::hash< hash1 >
-                , cc::split_list::ordered_list_traits< 
+                , cc::split_list::ordered_list_traits<
                     typename cc::iterable_list::make_traits<
                         cds::opt::less< less >
                     >::type
@@ -104,11 +104,11 @@ namespace {
 
     TEST_F( SplitListIterableMap_DHP, cmpmix )
     {
-        typedef cc::SplitListMap< gc_type, key_type, value_type, 
+        typedef cc::SplitListMap< gc_type, key_type, value_type,
             typename cc::split_list::make_traits<
                 cc::split_list::ordered_list< cc::iterable_list_tag >
                 , cds::opt::hash< hash1 >
-                , cc::split_list::ordered_list_traits< 
+                , cc::split_list::ordered_list_traits<
                     typename cc::iterable_list::make_traits<
                         cds::opt::less< less >
                         , cds::opt::compare< cmp >
@@ -161,8 +161,8 @@ namespace {
 
         map_type m( kSize, 2 );
         test( m );
-        EXPECT_NE( m.statistics().m_nInsertSuccess, 0 );
-        EXPECT_NE( m.list_statistics().m_nInsertSuccess, 0 );
+        EXPECT_NE( m.statistics().m_nInsertSuccess, 0u );
+        EXPECT_NE( m.list_statistics().m_nInsertSuccess, 0u );
     }
 
     TEST_F( SplitListIterableMap_DHP, back_off )