Bugfix

diff --git a/cds/container/lazy_list_nogc.h b/cds/container/lazy_list_nogc.h
index b10ad3536ee91a9353075a32b30b1683c573eea7..c4d8a2ea1df0512e2f75db576412849c99e2f39e 100644 (file)
--- a/cds/container/lazy_list_nogc.h
+++ b/cds/container/lazy_list_nogc.h
@@ -440,9 +440,8 @@ namespace cds { namespace container {
             std::pair<bool, bool> ret = base_class::update_at( &refHead, *pNode,
                 [&pItemFound](bool, node_type& item, node_type&){ pItemFound = &item; },
                 bAllowInsert );
             std::pair<bool, bool> ret = base_class::update_at( &refHead, *pNode,
                 [&pItemFound](bool, node_type& item, node_type&){ pItemFound = &item; },
                 bAllowInsert );

-            assert( pItemFound != nullptr );

 
 

-            if ( ret.first && ret.second )
+            if ( ret.second )

                 pNode.release();
 
             return std::make_pair( pItemFound, ret.second );
                 pNode.release();
 
             return std::make_pair( pItemFound, ret.second );

diff --git a/cds/container/michael_list_nogc.h b/cds/container/michael_list_nogc.h
index b6a48ce0d49f242517f95b754d0a9c1954ac046d..3c41b4dee1361bfe59ed6952c5c52212979669c4 100644 (file)
--- a/cds/container/michael_list_nogc.h
+++ b/cds/container/michael_list_nogc.h
@@ -420,9 +420,8 @@ namespace cds { namespace container {
             std::pair<bool, bool> ret = base_class::update_at( refHead, *pNode,
                 [&pItemFound](bool, node_type& item, node_type&) { pItemFound = &item; },
                 bAllowInsert );
             std::pair<bool, bool> ret = base_class::update_at( refHead, *pNode,
                 [&pItemFound](bool, node_type& item, node_type&) { pItemFound = &item; },
                 bAllowInsert );

-            assert( pItemFound != nullptr );

 
 

-            if ( ret.first && ret.second )
+            if ( ret.second )

                 pNode.release();
             return std::make_pair( pItemFound, ret.second );
         }
                 pNode.release();
             return std::make_pair( pItemFound, ret.second );
         }

diff --git a/projects/Win/vc12/cds.sln b/projects/Win/vc12/cds.sln
index 5b7477b7adadaa06a58a709937843f22d5457c68..9e7376083e42f59547ca1c4565cdad87cdc58fa3 100644 (file)
--- a/projects/Win/vc12/cds.sln
+++ b/projects/Win/vc12/cds.sln
@@ -4,7 +4,7 @@ VisualStudioVersion = 12.0.40629.0
 MinimumVisualStudioVersion = 10.0.40219.1\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cds", "cds.vcxproj", "{408FE9BC-44F0-4E6A-89FA-D6F952584239}"\r
 EndProject\r
 MinimumVisualStudioVersion = 10.0.40219.1\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cds", "cds.vcxproj", "{408FE9BC-44F0-4E6A-89FA-D6F952584239}"\r
 EndProject\r

-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "unit-test", "unit-test", "{B30CA283-1796-4763-92C3-2E4848D443F7}"\r
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "multi-threaded test", "multi-threaded test", "{B30CA283-1796-4763-92C3-2E4848D443F7}"\r

        ProjectSection(SolutionItems) = preProject\r
                ..\..\..\tests\unit\print_bronsonavltree_stat.h = ..\..\..\tests\unit\print_bronsonavltree_stat.h\r
                ..\..\..\tests\unit\print_cuckoo_stat.h = ..\..\..\tests\unit\print_cuckoo_stat.h\r
        ProjectSection(SolutionItems) = preProject\r
                ..\..\..\tests\unit\print_bronsonavltree_stat.h = ..\..\..\tests\unit\print_bronsonavltree_stat.h\r
                ..\..\..\tests\unit\print_cuckoo_stat.h = ..\..\..\tests\unit\print_cuckoo_stat.h\r


@@ -41,7 +41,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unit-stack", "unit-stack.vc
                {408FE9BC-44F0-4E6A-89FA-D6F952584239} = {408FE9BC-44F0-4E6A-89FA-D6F952584239}\r
        EndProjectSection\r
 EndProject\r
                {408FE9BC-44F0-4E6A-89FA-D6F952584239} = {408FE9BC-44F0-4E6A-89FA-D6F952584239}\r
        EndProjectSection\r
 EndProject\r

-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "hdr-test", "hdr-test", "{B8C24D26-A3BF-4DA6-B64C-142CBA4BFE75}"\r
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "single-threaded test", "single-threaded test", "{B8C24D26-A3BF-4DA6-B64C-142CBA4BFE75}"\r

        ProjectSection(SolutionItems) = preProject\r
                ..\..\..\tests\test-hdr\size_check.h = ..\..\..\tests\test-hdr\size_check.h\r
        EndProjectSection\r
        ProjectSection(SolutionItems) = preProject\r
                ..\..\..\tests\test-hdr\size_check.h = ..\..\..\tests\test-hdr\size_check.h\r
        EndProjectSection\r

diff --git a/projects/Win/vc12/hdr-test-striped-set.vcxproj b/projects/Win/vc12/hdr-test-striped-set.vcxproj
index eb90bedfcc8859f9f470b5e30240a82efb54b605..b7ee1625d6a6a3e0ea835f41390ec5a19a0d49cf 100644 (file)
--- a/projects/Win/vc12/hdr-test-striped-set.vcxproj
+++ b/projects/Win/vc12/hdr-test-striped-set.vcxproj
@@ -92,7 +92,6 @@
     <ClInclude Include="..\..\..\tests\test-hdr\set\hdr_intrusive_striped_set.h" />\r
     <ClInclude Include="..\..\..\tests\test-hdr\set\hdr_striped_set.h" />\r
     <ClInclude Include="..\..\..\tests\test-hdr\set\intrusive_cuckoo_set_common.h" />\r
     <ClInclude Include="..\..\..\tests\test-hdr\set\hdr_intrusive_striped_set.h" />\r
     <ClInclude Include="..\..\..\tests\test-hdr\set\hdr_striped_set.h" />\r
     <ClInclude Include="..\..\..\tests\test-hdr\set\intrusive_cuckoo_set_common.h" />\r

-    <ClInclude Include="..\..\..\tests\test-hdr\size_check.h" />\r

   </ItemGroup>\r
   <PropertyGroup Label="Globals">\r
     <ProjectGuid>{A38E5597-6916-4480-A343-C9846EF544E4}</ProjectGuid>\r
   </ItemGroup>\r
   <PropertyGroup Label="Globals">\r
     <ProjectGuid>{A38E5597-6916-4480-A343-C9846EF544E4}</ProjectGuid>\r

diff --git a/projects/Win/vc12/hdr-test-striped-set.vcxproj.filters b/projects/Win/vc12/hdr-test-striped-set.vcxproj.filters
index 18d9634505fd9c4105ab7b5a5da36157b330e846..80351d37e06840f1ab9e9a464c6b3b0d1c28cd67 100644 (file)
--- a/projects/Win/vc12/hdr-test-striped-set.vcxproj.filters
+++ b/projects/Win/vc12/hdr-test-striped-set.vcxproj.filters
@@ -164,6 +164,5 @@
     <ClInclude Include="..\..\..\tests\test-hdr\set\hdr_striped_set.h">\r
       <Filter>container\striped</Filter>\r
     </ClInclude>\r
     <ClInclude Include="..\..\..\tests\test-hdr\set\hdr_striped_set.h">\r
       <Filter>container\striped</Filter>\r
     </ClInclude>\r

-    <ClInclude Include="..\..\..\tests\test-hdr\size_check.h" />\r

   </ItemGroup>\r
 </Project>
\ No newline at end of file
   </ItemGroup>\r
 </Project>
\ No newline at end of file

diff --git a/projects/Win/vc14/cds.sln b/projects/Win/vc14/cds.sln
index 9680bb49a60c6bdd6c3049ce245d7953f336939a..4654ba1299e8ab84b795472871707d187c2d26b8 100644 (file)
--- a/projects/Win/vc14/cds.sln
+++ b/projects/Win/vc14/cds.sln
@@ -4,7 +4,7 @@ VisualStudioVersion = 14.0.23107.0
 MinimumVisualStudioVersion = 10.0.40219.1\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cds", "cds.vcxproj", "{408FE9BC-44F0-4E6A-89FA-D6F952584239}"\r
 EndProject\r
 MinimumVisualStudioVersion = 10.0.40219.1\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cds", "cds.vcxproj", "{408FE9BC-44F0-4E6A-89FA-D6F952584239}"\r
 EndProject\r

-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "unit-test", "unit-test", "{B30CA283-1796-4763-92C3-2E4848D443F7}"\r
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "multi-threaded test", "multi-threaded test", "{B30CA283-1796-4763-92C3-2E4848D443F7}"\r

        ProjectSection(SolutionItems) = preProject\r
                ..\..\..\tests\unit\print_bronsonavltree_stat.h = ..\..\..\tests\unit\print_bronsonavltree_stat.h\r
                ..\..\..\tests\unit\print_cuckoo_stat.h = ..\..\..\tests\unit\print_cuckoo_stat.h\r
        ProjectSection(SolutionItems) = preProject\r
                ..\..\..\tests\unit\print_bronsonavltree_stat.h = ..\..\..\tests\unit\print_bronsonavltree_stat.h\r
                ..\..\..\tests\unit\print_cuckoo_stat.h = ..\..\..\tests\unit\print_cuckoo_stat.h\r


@@ -41,7 +41,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unit-stack", "unit-stack.vc
                {408FE9BC-44F0-4E6A-89FA-D6F952584239} = {408FE9BC-44F0-4E6A-89FA-D6F952584239}\r
        EndProjectSection\r
 EndProject\r
                {408FE9BC-44F0-4E6A-89FA-D6F952584239} = {408FE9BC-44F0-4E6A-89FA-D6F952584239}\r
        EndProjectSection\r
 EndProject\r

-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "hdr-test", "hdr-test", "{B8C24D26-A3BF-4DA6-B64C-142CBA4BFE75}"\r
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "single-threaded test", "single-threaded test", "{B8C24D26-A3BF-4DA6-B64C-142CBA4BFE75}"\r

        ProjectSection(SolutionItems) = preProject\r
                ..\..\..\tests\test-hdr\size_check.h = ..\..\..\tests\test-hdr\size_check.h\r
        EndProjectSection\r
        ProjectSection(SolutionItems) = preProject\r
                ..\..\..\tests\test-hdr\size_check.h = ..\..\..\tests\test-hdr\size_check.h\r
        EndProjectSection\r

diff --git a/projects/Win/vc14/hdr-test-striped-set.vcxproj b/projects/Win/vc14/hdr-test-striped-set.vcxproj
index 43c9dbd02beef2460f4b771cf1f85c35dc236b95..3b30583b6ed56d0d59076d403590fd1e62ce6132 100644 (file)
--- a/projects/Win/vc14/hdr-test-striped-set.vcxproj
+++ b/projects/Win/vc14/hdr-test-striped-set.vcxproj
@@ -100,7 +100,6 @@
     <ClInclude Include="..\..\..\tests\test-hdr\set\hdr_intrusive_striped_set.h" />\r
     <ClInclude Include="..\..\..\tests\test-hdr\set\hdr_striped_set.h" />\r
     <ClInclude Include="..\..\..\tests\test-hdr\set\intrusive_cuckoo_set_common.h" />\r
     <ClInclude Include="..\..\..\tests\test-hdr\set\hdr_intrusive_striped_set.h" />\r
     <ClInclude Include="..\..\..\tests\test-hdr\set\hdr_striped_set.h" />\r
     <ClInclude Include="..\..\..\tests\test-hdr\set\intrusive_cuckoo_set_common.h" />\r

-    <ClInclude Include="..\..\..\tests\test-hdr\size_check.h" />\r

   </ItemGroup>\r
   <PropertyGroup Label="Globals">\r
     <ProjectGuid>{A38E5597-6916-4480-A343-C9846EF544E4}</ProjectGuid>\r
   </ItemGroup>\r
   <PropertyGroup Label="Globals">\r
     <ProjectGuid>{A38E5597-6916-4480-A343-C9846EF544E4}</ProjectGuid>\r

diff --git a/projects/Win/vc14/hdr-test-striped-set.vcxproj.filters b/projects/Win/vc14/hdr-test-striped-set.vcxproj.filters
index 18d9634505fd9c4105ab7b5a5da36157b330e846..80351d37e06840f1ab9e9a464c6b3b0d1c28cd67 100644 (file)
--- a/projects/Win/vc14/hdr-test-striped-set.vcxproj.filters
+++ b/projects/Win/vc14/hdr-test-striped-set.vcxproj.filters
@@ -164,6 +164,5 @@
     <ClInclude Include="..\..\..\tests\test-hdr\set\hdr_striped_set.h">\r
       <Filter>container\striped</Filter>\r
     </ClInclude>\r
     <ClInclude Include="..\..\..\tests\test-hdr\set\hdr_striped_set.h">\r
       <Filter>container\striped</Filter>\r
     </ClInclude>\r

-    <ClInclude Include="..\..\..\tests\test-hdr\size_check.h" />\r

   </ItemGroup>\r
 </Project>
\ No newline at end of file
   </ItemGroup>\r
 </Project>
\ No newline at end of file

diff --git a/projects/source.unit.map.mk b/projects/source.unit.map.mk
index 33ff37f527f7dcb3d0dbe82ef00f94c373715f76..5a212d4e42b14bd2f2c70f2ea1c12fc84a300bdf 100644 (file)
--- a/projects/source.unit.map.mk
+++ b/projects/source.unit.map.mk
@@ -63,6 +63,7 @@ CDSUNIT_MAP_SOURCES := \
     tests/unit/map2/map_insdel_item_string_cuckoo.cpp \
     tests/unit/map2/map_insdel_item_string_ellentree.cpp \
     tests/unit/map2/map_insdel_item_string_michael.cpp \
     tests/unit/map2/map_insdel_item_string_cuckoo.cpp \
     tests/unit/map2/map_insdel_item_string_ellentree.cpp \
     tests/unit/map2/map_insdel_item_string_michael.cpp \

+    tests/unit/map2/map_insdel_item_string_multilevelhashmap.cpp \

     tests/unit/map2/map_insdel_item_string_skip.cpp \
     tests/unit/map2/map_insdel_item_string_split.cpp \
     tests/unit/map2/map_insdel_item_string_striped.cpp \
     tests/unit/map2/map_insdel_item_string_skip.cpp \
     tests/unit/map2/map_insdel_item_string_split.cpp \
     tests/unit/map2/map_insdel_item_string_striped.cpp \


@@ -71,6 +72,7 @@ CDSUNIT_MAP_SOURCES := \
     tests/unit/map2/map_insdel_string_cuckoo.cpp \
     tests/unit/map2/map_insdel_string_ellentree.cpp \
     tests/unit/map2/map_insdel_string_michael.cpp \
     tests/unit/map2/map_insdel_string_cuckoo.cpp \
     tests/unit/map2/map_insdel_string_ellentree.cpp \
     tests/unit/map2/map_insdel_string_michael.cpp \

+    tests/unit/map2/map_insdel_string_multilevelhashmap.cpp \

     tests/unit/map2/map_insdel_string_skip.cpp \
     tests/unit/map2/map_insdel_string_split.cpp \
     tests/unit/map2/map_insdel_string_striped.cpp \
     tests/unit/map2/map_insdel_string_skip.cpp \
     tests/unit/map2/map_insdel_string_split.cpp \
     tests/unit/map2/map_insdel_string_striped.cpp \

diff --git a/tests/test-hdr/set/hdr_intrusive_set.h b/tests/test-hdr/set/hdr_intrusive_set.h
index 4a047e3c4d0be9a826308888efbdcff4a8b3d48b..9642e5b92788cc81118620713da51b2cd2cf2bee 100644 (file)
--- a/tests/test-hdr/set/hdr_intrusive_set.h
+++ b/tests/test-hdr/set/hdr_intrusive_set.h
@@ -352,7 +352,7 @@ namespace set {
                 CPPUNIT_ASSERT( ret.first );
                 CPPUNIT_ASSERT( !ret.second );
                 CPPUNIT_ASSERT( v1.nUpdateNewCount == 1 );
                 CPPUNIT_ASSERT( ret.first );
                 CPPUNIT_ASSERT( !ret.second );
                 CPPUNIT_ASSERT( v1.nUpdateNewCount == 1 );

-                CPPUNIT_ASSERT( v1.nUpdateCount == 1 );
+                CPPUNIT_ASSERT( v1.nUpdateCount == 2 );

                 CPPUNIT_ASSERT( check_size( s, 3 ));
 
                 ret = s.update( v2, f );
                 CPPUNIT_ASSERT( check_size( s, 3 ));
 
                 ret = s.update( v2, f );


@@ -743,7 +743,7 @@ namespace set {
                     CPPUNIT_ASSERT( ret.first );
                     CPPUNIT_ASSERT( !ret.second );
                     CPPUNIT_ASSERT( v1.nUpdateNewCount == 1 );
                     CPPUNIT_ASSERT( ret.first );
                     CPPUNIT_ASSERT( !ret.second );
                     CPPUNIT_ASSERT( v1.nUpdateNewCount == 1 );

-                    CPPUNIT_ASSERT( v1.nUpdateCount == 1 );
+                    CPPUNIT_ASSERT( v1.nUpdateCount == 2 );

                     CPPUNIT_ASSERT( check_size( s, 3 ));
 
                     ret = s.update( v2, f );
                     CPPUNIT_ASSERT( check_size( s, 3 ));
 
                     ret = s.update( v2, f );


@@ -901,7 +901,7 @@ namespace set {
                 CPPUNIT_ASSERT( ret.first );
                 CPPUNIT_ASSERT( !ret.second );
                 CPPUNIT_ASSERT( v1.nUpdateNewCount == 1 );
                 CPPUNIT_ASSERT( ret.first );
                 CPPUNIT_ASSERT( !ret.second );
                 CPPUNIT_ASSERT( v1.nUpdateNewCount == 1 );

-                CPPUNIT_ASSERT( v1.nUpdateCount == 1 );
+                CPPUNIT_ASSERT( v1.nUpdateCount == 2 );

                 CPPUNIT_ASSERT( check_size( s, 3 ));
 
                 ret = s.update( v2, f );
                 CPPUNIT_ASSERT( check_size( s, 3 ));
 
                 ret = s.update( v2, f );

diff --git a/tests/unit/map2/CMakeLists.txt b/tests/unit/map2/CMakeLists.txt
index 1a51a7652701cc47687ba33834ebe4fed388e36f..319c86ab1f95d4c83d93ed23c488527e9eaaeff5 100644 (file)
--- a/tests/unit/map2/CMakeLists.txt
+++ b/tests/unit/map2/CMakeLists.txt
@@ -64,6 +64,7 @@ set(CDSUNIT_MAP_SOURCES
     map_insdel_item_string_cuckoo.cpp
     map_insdel_item_string_ellentree.cpp
     map_insdel_item_string_michael.cpp
     map_insdel_item_string_cuckoo.cpp
     map_insdel_item_string_ellentree.cpp
     map_insdel_item_string_michael.cpp

+    map_insdel_item_string_multilevelhashmap.cpp

     map_insdel_item_string_skip.cpp
     map_insdel_item_string_split.cpp
     map_insdel_item_string_striped.cpp
     map_insdel_item_string_skip.cpp
     map_insdel_item_string_split.cpp
     map_insdel_item_string_striped.cpp


@@ -72,6 +73,7 @@ set(CDSUNIT_MAP_SOURCES
     map_insdel_string_cuckoo.cpp
     map_insdel_string_ellentree.cpp
     map_insdel_string_michael.cpp
     map_insdel_string_cuckoo.cpp
     map_insdel_string_ellentree.cpp
     map_insdel_string_michael.cpp

+    map_insdel_string_multilevelhashmap.cpp

     map_insdel_string_skip.cpp
     map_insdel_string_split.cpp
     map_insdel_string_striped.cpp
     map_insdel_string_skip.cpp
     map_insdel_string_split.cpp
     map_insdel_string_striped.cpp

diff --git a/tests/unit/map2/map_delodd.h b/tests/unit/map2/map_delodd.h
index 3bafa791bedea6e28e3af5c993fc2f112b6faf99..01f3af6f74d1a8015124999754e2f7e772381769 100644 (file)
--- a/tests/unit/map2/map_delodd.h
+++ b/tests/unit/map2/map_delodd.h
@@ -133,8 +133,6 @@ namespace map2 {
         std::vector<size_t>     m_arrRemove;
 
     protected:
         std::vector<size_t>     m_arrRemove;
 
     protected:

-        typedef CppUnitMini::TestCase Base;
-

         typedef key_thread  key_type;
         typedef size_t      value_type;
         typedef std::pair<key_type const, value_type> pair_type;
         typedef key_thread  key_type;
         typedef size_t      value_type;
         typedef std::pair<key_type const, value_type> pair_type;

diff --git a/tests/unit/map2/map_find_int.cpp b/tests/unit/map2/map_find_int.cpp
index 23dced06971e9544b56e6e15112ae38b1fbc11f4..0cd093174afc63b386801791cd6c1958e464e0cd 100644 (file)
--- a/tests/unit/map2/map_find_int.cpp
+++ b/tests/unit/map2/map_find_int.cpp
@@ -1,7 +1,5 @@
 //$$CDS-header$$
 
 //$$CDS-header$$
 

-// defines concurrent access to map::nonconcurrent_iterator::Sequence::TValue::nAccess field
-

 #include "map2/map_find_int.h"
 
 // find int test in map<int> in mutithreaded mode
 #include "map2/map_find_int.h"
 
 // find int test in map<int> in mutithreaded mode

diff --git a/tests/unit/map2/map_find_int.h b/tests/unit/map2/map_find_int.h
index b4cde50306cc1c1ac4bdcd7fabefc28a23e0df7f..9e73d4c9ac56b3e388099a1e11c2adbb48dc9cf6 100644 (file)
--- a/tests/unit/map2/map_find_int.h
+++ b/tests/unit/map2/map_find_int.h
@@ -32,7 +32,6 @@ namespace map2 {
         size_t  c_nLoadFactor;  // current load factor
 
     private:
         size_t  c_nLoadFactor;  // current load factor
 
     private:

-        typedef CppUnitMini::TestCase Base;

         typedef size_t   key_type;
         struct value_type {
             key_type    nKey    ;   // key
         typedef size_t   key_type;
         struct value_type {
             key_type    nKey    ;   // key

diff --git a/tests/unit/map2/map_find_string.h b/tests/unit/map2/map_find_string.h
index 3ca6ace9b59a5401eb331b384e055969459d3413..1a65536ca70efc922fc50cfc5e2806af40610908 100644 (file)
--- a/tests/unit/map2/map_find_string.h
+++ b/tests/unit/map2/map_find_string.h
@@ -29,7 +29,6 @@ namespace map2 {
         size_t  c_nLoadFactor;  // current load factor
 
     private:
         size_t  c_nLoadFactor;  // current load factor
 
     private:

-        typedef CppUnitMini::TestCase Base;

         typedef std::string  key_type;
         struct value_type {
             std::string const * pKey;
         typedef std::string  key_type;
         struct value_type {
             std::string const * pKey;


@@ -206,17 +205,6 @@ namespace map2 {
             }
         }
 
             }
         }
 

-        template <class Map>
-        void test_nolf()
-        {
-            initTestSequence();
-
-            Map testMap;
-            find_string_test( testMap );
-            if ( c_bPrintGCState )
-                print_gc_state();
-        }
-

         void setUpParams( const CppUnitMini::TestCfg& cfg );
 
 #   include "map2/map_defs.h"
         void setUpParams( const CppUnitMini::TestCfg& cfg );
 
 #   include "map2/map_defs.h"

diff --git a/tests/unit/map2/map_insdel_func.h b/tests/unit/map2/map_insdel_func.h
index 24021abd308a8b7f5fb8756bf37dd48ad71527c8..14ca7f282e9b65197ca5132997a8a1e6279ac8a7 100644 (file)
--- a/tests/unit/map2/map_insdel_func.h
+++ b/tests/unit/map2/map_insdel_func.h
@@ -542,7 +542,6 @@ namespace map2 {
             }
         }
 
             }
         }
 

-        typedef CppUnitMini::TestCase Base;

         void setUpParams( const CppUnitMini::TestCfg& cfg );
 
 #   include "map2/map_defs.h"
         void setUpParams( const CppUnitMini::TestCfg& cfg );
 
 #   include "map2/map_defs.h"

diff --git a/tests/unit/map2/map_insdel_int.h b/tests/unit/map2/map_insdel_int.h
index a47738fd61eccbe8d7c7860092b224bf672e50c6..e3e67e3ea6e0848a77db9781a43f988b467f5d20 100644 (file)
--- a/tests/unit/map2/map_insdel_int.h
+++ b/tests/unit/map2/map_insdel_int.h
@@ -30,7 +30,6 @@ namespace map2 {
         size_t  c_nLoadFactor;  // current load factor
 
     private:
         size_t  c_nLoadFactor;  // current load factor
 
     private:

-        typedef CppUnitMini::TestCase Base;

         typedef size_t  key_type;
         typedef size_t  value_type;
 
         typedef size_t  key_type;
         typedef size_t  value_type;
 

diff --git a/tests/unit/map2/map_insdel_item_int.h b/tests/unit/map2/map_insdel_item_int.h
index 1578495044025bcee21d390e62a881fec2858f7c..d38d442fc7778d215e77e1e6c3d5f60a4fa5174b 100644 (file)
--- a/tests/unit/map2/map_insdel_item_int.h
+++ b/tests/unit/map2/map_insdel_item_int.h
@@ -29,7 +29,6 @@ namespace map2 {
         size_t  c_nLoadFactor = 2;  // current load factor
 
     private:
         size_t  c_nLoadFactor = 2;  // current load factor
 
     private:

-        typedef CppUnitMini::TestCase Base;

         typedef size_t  key_type;
         typedef size_t  value_type;
 
         typedef size_t  key_type;
         typedef size_t  value_type;
 

diff --git a/tests/unit/map2/map_insdel_item_string.h b/tests/unit/map2/map_insdel_item_string.h
index 7156d54da3bd60ab1a43e42f0d24cc24ff639dcf..94b9569a02bf6c90879256a00507a13394021247 100644 (file)
--- a/tests/unit/map2/map_insdel_item_string.h
+++ b/tests/unit/map2/map_insdel_item_string.h
@@ -29,7 +29,6 @@ namespace map2 {
         size_t  c_nLoadFactor = 2;  // current load factor
 
     private:
         size_t  c_nLoadFactor = 2;  // current load factor
 
     private:

-        typedef CppUnitMini::TestCase Base;

         typedef std::string  key_type;
         typedef size_t  value_type;
 
         typedef std::string  key_type;
         typedef size_t  value_type;
 

diff --git a/tests/unit/map2/map_insdel_string.h b/tests/unit/map2/map_insdel_string.h
index 372bbd6b009e979fa1243c49d874939b31deba4c..0f2558a09a4fc16e93d2e8e2222fc0a3478cd126 100644 (file)
--- a/tests/unit/map2/map_insdel_string.h
+++ b/tests/unit/map2/map_insdel_string.h
@@ -30,7 +30,6 @@ namespace map2 {
         size_t  c_nLoadFactor;  // current load factor
 
     private:
         size_t  c_nLoadFactor;  // current load factor
 
     private:

-        typedef CppUnitMini::TestCase Base;

         typedef std::string key_type;
         typedef size_t      value_type;
 
         typedef std::string key_type;
         typedef size_t      value_type;
 

diff --git a/tests/unit/map2/map_insdelfind.h b/tests/unit/map2/map_insdelfind.h
index e382ad2869a44a9945812bb3060bbe8d4a508b68..50bf2a188c46869bc2a185b0957b554556f41319 100644 (file)
--- a/tests/unit/map2/map_insdelfind.h
+++ b/tests/unit/map2/map_insdelfind.h
@@ -39,7 +39,6 @@ namespace map2 {
         actions m_arrShuffle[c_nShuffleSize];
 
     protected:
         actions m_arrShuffle[c_nShuffleSize];
 
     protected:

-        typedef CppUnitMini::TestCase Base;

         typedef size_t  key_type;
         typedef size_t  value_type;
 
         typedef size_t  key_type;
         typedef size_t  value_type;
 

diff --git a/tests/unit/map2/map_insfind_int.h b/tests/unit/map2/map_insfind_int.h
index 35f4cbeef057e4da94c5c83d58dcaa0aca6da90a..7e0096e30d977154e846841a2e0388f2fecb34f6 100644 (file)
--- a/tests/unit/map2/map_insfind_int.h
+++ b/tests/unit/map2/map_insfind_int.h
@@ -28,7 +28,6 @@ namespace map2 {
         size_t  c_nLoadFactor = 2;  // current load factor
 
     private:
         size_t  c_nLoadFactor = 2;  // current load factor
 
     private:

-        typedef CppUnitMini::TestCase Base;

         typedef size_t  key_type;
         typedef size_t  value_type;
 
         typedef size_t  key_type;
         typedef size_t  value_type;
 

diff --git a/tests/unit/map2/map_type_skip_list.h b/tests/unit/map2/map_type_skip_list.h
index 2a4cd57cfa27e043aaf33b0cbdfae05c31a43f39..37a5ad05a63610de477941b8e30573288c958c13 100644 (file)
--- a/tests/unit/map2/map_type_skip_list.h
+++ b/tests/unit/map2/map_type_skip_list.h
@@ -14,7 +14,7 @@
 
 namespace map2 {
 
 
 namespace map2 {
 

-    template <class GC, typename Key, typename T, typename Traits = cc::split_list::traits >
+    template <class GC, typename Key, typename T, typename Traits = cc::skip_list::traits >

     class SkipListMap : public cc::SkipListMap< GC, Key, T, Traits >
     {
         typedef cc::SkipListMap< GC, Key, T, Traits > base_class;
     class SkipListMap : public cc::SkipListMap< GC, Key, T, Traits >
     {
         typedef cc::SkipListMap< GC, Key, T, Traits > base_class;

diff --git a/tests/unit/set2/set_delodd.h b/tests/unit/set2/set_delodd.h
index 0f14a6af2e13a16b2ea59ede607fe6eeac8374b1..4ade55db1d8d713efbd1c8cce9156ae6f30fddcc 100644 (file)
--- a/tests/unit/set2/set_delodd.h
+++ b/tests/unit/set2/set_delodd.h
@@ -132,7 +132,6 @@ namespace set2 {
         std::vector<size_t>     m_arrData;
 
     protected:
         std::vector<size_t>     m_arrData;
 
     protected:

-        typedef CppUnitMini::TestCase Base;

         typedef key_thread  key_type;
         typedef size_t      value_type;
 
         typedef key_thread  key_type;
         typedef size_t      value_type;
 

diff --git a/tests/unit/set2/set_insdel_string.h b/tests/unit/set2/set_insdel_string.h
index 7608542f8f0ddf1c8c9d63261cafc0662e9d6b31..37dddb06655872e17447844f6ff648d2ca527c9e 100644 (file)
--- a/tests/unit/set2/set_insdel_string.h
+++ b/tests/unit/set2/set_insdel_string.h
@@ -29,7 +29,6 @@ namespace set2 {
         size_t c_nLoadFactor = 2;
 
     private:
         size_t c_nLoadFactor = 2;
 
     private:

-        typedef CppUnitMini::TestCase Base;

         typedef std::string key_type;
         typedef size_t      value_type;
 
         typedef std::string key_type;
         typedef size_t      value_type;
 

diff --git a/tests/unit/set2/set_insdelfind.h b/tests/unit/set2/set_insdelfind.h
index 74971e88c787b6b94a311cadd277363ec4d255ce..89be492f8b78992aea5a1e987e535ea6684c7bab 100644 (file)
--- a/tests/unit/set2/set_insdelfind.h
+++ b/tests/unit/set2/set_insdelfind.h
@@ -38,7 +38,6 @@ namespace set2 {
         actions m_arrShuffle[c_nShuffleSize];
 
     protected:
         actions m_arrShuffle[c_nShuffleSize];
 
     protected:

-        typedef CppUnitMini::TestCase Base;

         typedef size_t  key_type;
         typedef size_t  value_type;
 
         typedef size_t  key_type;
         typedef size_t  value_type;