Added erase_at( iterator ) function to MichaelHashSet/Map and SplitListSet/Map based...

[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 339dc51f47cbb8beda48c20d7320ea73d64ae890..d95c228585cbddb74a56524c6d78d4633f951660 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/
@@ -38,7 +38,7 @@ namespace {
     namespace cc = cds::container;
     typedef cds::gc::DHP gc_type;
 
-    class SplitListIterableMap_DHP : public cds_test::michael_iterable_map
+    class SplitListIterableMap_DHP : public cds_test::michael_iterable_hp
     {
     protected:
         typedef cds_test::michael_iterable_map base_class;
@@ -55,14 +55,14 @@ 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();
         }
     };
 
@@ -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 )