Fixed minor gcc warnings

diff --git a/cds/container/impl/iterable_kvlist.h b/cds/container/impl/iterable_kvlist.h
index e0a1308bd6f5653485e4d265aa69a3fbb7aab257..ece702837c70cb7d58ef98f06d467d2105528b79 100644 (file)
--- a/cds/container/impl/iterable_kvlist.h
+++ b/cds/container/impl/iterable_kvlist.h
@@ -5,7 +5,7 @@
 
     Source code repo: http://github.com/khizmax/libcds/
     Download: http://sourceforge.net/projects/libcds/files/
-    
+
     Redistribution and use in source and binary forms, with or without
     modification, are permitted provided that the following conditions are met:
 

diff --git a/cds/container/impl/iterable_list.h b/cds/container/impl/iterable_list.h
index e32f89458561032a59ff9eba2769f2ba114443ab..ae058609cf7177e3ab6394377310374f9845af38 100644 (file)
--- a/cds/container/impl/iterable_list.h
+++ b/cds/container/impl/iterable_list.h
@@ -5,7 +5,7 @@
 
     Source code repo: http://github.com/khizmax/libcds/
     Download: http://sourceforge.net/projects/libcds/files/
-    
+
     Redistribution and use in source and binary forms, with or without
     modification, are permitted provided that the following conditions are met:
 

diff --git a/cds/container/michael_map.h b/cds/container/michael_map.h
index f0cd85975d051b3d4200844c1fa5e79c5f716dae..6c67eb30859ec86cd15cab6420336f459021b531 100644 (file)
--- a/cds/container/michael_map.h
+++ b/cds/container/michael_map.h
@@ -5,7 +5,7 @@
 
     Source code repo: http://github.com/khizmax/libcds/
     Download: http://sourceforge.net/projects/libcds/files/
-    
+
     Redistribution and use in source and binary forms, with or without
     modification, are permitted provided that the following conditions are met:
 

diff --git a/cds/intrusive/details/iterable_list_base.h b/cds/intrusive/details/iterable_list_base.h
index 381a28a24095ba71452edbc091d863cf3cdd7067..198b5d59c41327759c3b4b4b7397d717581252b3 100644 (file)
--- a/cds/intrusive/details/iterable_list_base.h
+++ b/cds/intrusive/details/iterable_list_base.h
@@ -5,7 +5,7 @@
 
     Source code repo: http://github.com/khizmax/libcds/
     Download: http://sourceforge.net/projects/libcds/files/
-    
+
     Redistribution and use in source and binary forms, with or without
     modification, are permitted provided that the following conditions are met:
 
@@ -190,7 +190,7 @@ namespace cds { namespace intrusive {
             typedef empty_stat                      stat;
 
             /// Item counting feature; by default, disabled. Use \p cds::atomicity::item_counter to enable item counting
-            typedef atomicity::empty_item_counter     item_counter;
+            typedef atomicity::empty_item_counter   item_counter;
 
             /// C++ memory ordering model
             /**

diff --git a/cds/intrusive/details/michael_set_base.h b/cds/intrusive/details/michael_set_base.h
index bc8490e709d7a1033b637cfde868dd2efa6dfb9b..aa135fdf5d3f7824b95a8a9f7f57aad6d50d4313 100644 (file)
--- a/cds/intrusive/details/michael_set_base.h
+++ b/cds/intrusive/details/michael_set_base.h
@@ -5,7 +5,7 @@
 
     Source code repo: http://github.com/khizmax/libcds/
     Download: http://sourceforge.net/projects/libcds/files/
-    
+
     Redistribution and use in source and binary forms, with or without
     modification, are permitted provided that the following conditions are met:
 

diff --git a/cds/intrusive/impl/iterable_list.h b/cds/intrusive/impl/iterable_list.h
index cbb763529c3edf2ac515ee0cd25cb1b3cc09faf4..a05ae6cd37144b6b0e9cd2b9c4f70ff21374fca0 100644 (file)
--- a/cds/intrusive/impl/iterable_list.h
+++ b/cds/intrusive/impl/iterable_list.h
@@ -5,7 +5,7 @@
 
     Source code repo: http://github.com/khizmax/libcds/
     Download: http://sourceforge.net/projects/libcds/files/
-    
+
     Redistribution and use in source and binary forms, with or without
     modification, are permitted provided that the following conditions are met:
 

diff --git a/cds/intrusive/michael_set.h b/cds/intrusive/michael_set.h
index 1f3968555d03c405a6d79554f1fa1cecb5b0c6ee..532ac4de1e40907844ed442985a8789efd4d5558 100644 (file)
--- a/cds/intrusive/michael_set.h
+++ b/cds/intrusive/michael_set.h
@@ -5,7 +5,7 @@
 
     Source code repo: http://github.com/khizmax/libcds/
     Download: http://sourceforge.net/projects/libcds/files/
-    
+
     Redistribution and use in source and binary forms, with or without
     modification, are permitted provided that the following conditions are met:
 

diff --git a/projects/Win/vc14/gtest-misc.vcxproj.filters b/projects/Win/vc14/gtest-misc.vcxproj.filters
index 37266bf6d1aff81991da05d401ce7966998710b3..6318a602c4a49a4a71f6e7f46a78c0cea404ab01 100644 (file)
--- a/projects/Win/vc14/gtest-misc.vcxproj.filters
+++ b/projects/Win/vc14/gtest-misc.vcxproj.filters
@@ -9,10 +9,6 @@
       <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
       <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
     </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\test\unit\main.cpp">

diff --git a/projects/Win/vc14/gtest-set.vcxproj.filters b/projects/Win/vc14/gtest-set.vcxproj.filters
index 4fe9b8d8eb0746ec6acc77106cb3992d7b74d65a..c7b8eb7f3600fb9ebd8ee597b999afdfaf856ec7 100644 (file)
--- a/projects/Win/vc14/gtest-set.vcxproj.filters
+++ b/projects/Win/vc14/gtest-set.vcxproj.filters
@@ -9,10 +9,6 @@
       <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>\r
       <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>\r
     </Filter>\r
-    <Filter Include="Resource Files">\r
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>\r
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>\r
-    </Filter>\r
     <Filter Include="Source Files\MichaelSet">\r
       <UniqueIdentifier>{4c75be9d-6104-435d-b08f-09fa33b2bfcc}</UniqueIdentifier>\r
     </Filter>\r

diff --git a/projects/Win/vc14/gtest-striped-set.vcxproj.filters b/projects/Win/vc14/gtest-striped-set.vcxproj.filters
index e0f5f7e473c1fb840f64fdf3aa55e6024f7ddd51..2b7c7c594fc2fa79b89ee0a7fa257380459d9a37 100644 (file)
--- a/projects/Win/vc14/gtest-striped-set.vcxproj.filters
+++ b/projects/Win/vc14/gtest-striped-set.vcxproj.filters
@@ -9,10 +9,6 @@
       <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>\r
       <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>\r
     </Filter>\r
-    <Filter Include="Resource Files">\r
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>\r
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>\r
-    </Filter>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClCompile Include="..\..\..\test\unit\main.cpp">\r

diff --git a/projects/Win/vc14/stress-map-delodd.vcxproj.filters b/projects/Win/vc14/stress-map-delodd.vcxproj.filters
index 19954da4803b0030864a77d7b853341ae9d01007..82bb7268c164886b9f4b57d0f8e4cbef5319c68e 100644 (file)
--- a/projects/Win/vc14/stress-map-delodd.vcxproj.filters
+++ b/projects/Win/vc14/stress-map-delodd.vcxproj.filters
@@ -9,10 +9,6 @@
       <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
       <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
     </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\test\stress\main.cpp">

diff --git a/projects/Win/vc14/stress-map-find_int.vcxproj.filters b/projects/Win/vc14/stress-map-find_int.vcxproj.filters
index 86d671df47399089293a53e860d961d5431fdc73..4ae67ebe473fd7b2981f8f43cf265ce83f6a3aad 100644 (file)
--- a/projects/Win/vc14/stress-map-find_int.vcxproj.filters
+++ b/projects/Win/vc14/stress-map-find_int.vcxproj.filters
@@ -9,10 +9,6 @@
       <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
       <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
     </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\test\stress\main.cpp">

diff --git a/projects/Win/vc14/stress-map-find_string.vcxproj.filters b/projects/Win/vc14/stress-map-find_string.vcxproj.filters
index 4d4f2b6207d78b8c4bd0a35c0d2259efcedd423d..1a17e3bc4177fcb4b8a9d72859b45c3c1f329045 100644 (file)
--- a/projects/Win/vc14/stress-map-find_string.vcxproj.filters
+++ b/projects/Win/vc14/stress-map-find_string.vcxproj.filters
@@ -9,10 +9,6 @@
       <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
       <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
     </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\test\stress\main.cpp">

diff --git a/projects/Win/vc14/stress-map-insdel-func.vcxproj.filters b/projects/Win/vc14/stress-map-insdel-func.vcxproj.filters
index 05f85641e7e303ce3d0bc795d252ff54945adfa1..1a3164fac93306b2380d15bf694b07a2d331ec1e 100644 (file)
--- a/projects/Win/vc14/stress-map-insdel-func.vcxproj.filters
+++ b/projects/Win/vc14/stress-map-insdel-func.vcxproj.filters
@@ -9,10 +9,6 @@
       <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
       <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
     </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\test\stress\main.cpp">

diff --git a/projects/Win/vc14/stress-map-insdel-int.vcxproj.filters b/projects/Win/vc14/stress-map-insdel-int.vcxproj.filters
index 6d2e30293cd106e54a91a099df047f13c79a44f2..8a250daa833410dd39d24ad502cf7bf60d3e2709 100644 (file)
--- a/projects/Win/vc14/stress-map-insdel-int.vcxproj.filters
+++ b/projects/Win/vc14/stress-map-insdel-int.vcxproj.filters
@@ -9,10 +9,6 @@
       <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
       <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
     </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\test\stress\main.cpp">

diff --git a/projects/Win/vc14/stress-map-insdel-item-int.vcxproj.filters b/projects/Win/vc14/stress-map-insdel-item-int.vcxproj.filters
index 76b18d06988c59218a49e1232d168802e33326c9..4ef82f693f32e7fe5ac361e7f1cffab1abb0d95e 100644 (file)
--- a/projects/Win/vc14/stress-map-insdel-item-int.vcxproj.filters
+++ b/projects/Win/vc14/stress-map-insdel-item-int.vcxproj.filters
@@ -9,10 +9,6 @@
       <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
       <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
     </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\test\stress\main.cpp">

diff --git a/projects/Win/vc14/stress-map-insdel-string.vcxproj.filters b/projects/Win/vc14/stress-map-insdel-string.vcxproj.filters
index b2a3f6744636c839b2b97cf516bf84c735367ed6..46a388023db431a59cf7db43478e41c82eba72e9 100644 (file)
--- a/projects/Win/vc14/stress-map-insdel-string.vcxproj.filters
+++ b/projects/Win/vc14/stress-map-insdel-string.vcxproj.filters
@@ -9,10 +9,6 @@
       <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
       <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
     </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\test\stress\main.cpp">

diff --git a/projects/Win/vc14/stress-map-insdelfind.vcxproj.filters b/projects/Win/vc14/stress-map-insdelfind.vcxproj.filters
index 7ad17bf3048360f542859f265425615acdd92fd9..f9cd97056de9121879d1611f507ff84653c5f62b 100644 (file)
--- a/projects/Win/vc14/stress-map-insdelfind.vcxproj.filters
+++ b/projects/Win/vc14/stress-map-insdelfind.vcxproj.filters
@@ -9,10 +9,6 @@
       <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
       <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
     </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\test\stress\main.cpp">

diff --git a/projects/Win/vc14/stress-map-insfind-int.vcxproj.filters b/projects/Win/vc14/stress-map-insfind-int.vcxproj.filters
index 4cf6393147c74475594d94f14c52a654e7989193..da30273cc5c2497407099a0ca586cbcad96e15ee 100644 (file)
--- a/projects/Win/vc14/stress-map-insfind-int.vcxproj.filters
+++ b/projects/Win/vc14/stress-map-insfind-int.vcxproj.filters
@@ -9,10 +9,6 @@
       <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
       <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
     </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\test\stress\main.cpp">

diff --git a/test/include/cds_test/check_size.h b/test/include/cds_test/check_size.h
index 34a3b9900c409a60559eb85301cfebee118c7304..c72feb00c5f6e5d89cdab7a84e4ed0c6725e9875 100644 (file)
--- a/test/include/cds_test/check_size.h
+++ b/test/include/cds_test/check_size.h
@@ -5,7 +5,7 @@
 
     Source code repo: http://github.com/khizmax/libcds/
     Download: http://sourceforge.net/projects/libcds/files/
-    
+
     Redistribution and use in source and binary forms, with or without
     modification, are permitted provided that the following conditions are met:
 
@@ -25,7 +25,7 @@
     SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
     OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-    OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.     
+    OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 #ifndef CDSTEST_CHECK_SIZE_H

diff --git a/test/stress/map/insdel_func/map_insdel_func.h b/test/stress/map/insdel_func/map_insdel_func.h
index ab9637794299c5b7998ac9445c04afc398c727e0..d4f282da4abd3313b091b0ae48bdb18075624d2f 100644 (file)
--- a/test/stress/map/insdel_func/map_insdel_func.h
+++ b/test/stress/map/insdel_func/map_insdel_func.h
@@ -5,7 +5,7 @@
 
     Source code repo: http://github.com/khizmax/libcds/
     Download: http://sourceforge.net/projects/libcds/files/
-    
+
     Redistribution and use in source and binary forms, with or without
     modification, are permitted provided that the following conditions are met:
 
@@ -227,7 +227,7 @@ namespace map {
                     operator()( bNew, val.first, val.second );
                 }
 
-                // For FeldmanHashMap
+                // For FeldmanHashMap, IterableList
                 template <typename Val>
                 void operator()( Val& cur, Val * old )
                 {
@@ -517,6 +517,7 @@ namespace map {
                 testMap.erase( nItem );
 
             EXPECT_TRUE( testMap.empty());
+            EXPECT_TRUE( testMap.size(), 0u );
 
             additional_check( testMap );
             print_stat( propout(), testMap );

diff --git a/test/unit/intrusive-set/intrusive_michael_lazy_dhp.cpp b/test/unit/intrusive-set/intrusive_michael_lazy_dhp.cpp
index e4a6abaac8f36f7034fea9ebaf5db736cbd43433..835611b2edc36310265f67108011e723a4a40ea8 100644 (file)
--- a/test/unit/intrusive-set/intrusive_michael_lazy_dhp.cpp
+++ b/test/unit/intrusive-set/intrusive_michael_lazy_dhp.cpp
@@ -5,7 +5,7 @@
 
     Source code repo: http://github.com/khizmax/libcds/
     Download: http://sourceforge.net/projects/libcds/files/
-    
+
     Redistribution and use in source and binary forms, with or without
     modification, are permitted provided that the following conditions are met:
 
@@ -178,7 +178,7 @@ namespace {
 
         set_type s( kSize, 2 );
         test( s );
-        EXPECT_GE( s.statistics().m_nInsertSuccess, 0 );
+        EXPECT_GE( s.statistics().m_nInsertSuccess, 0u );
     }
 
     TEST_F( IntrusiveMichaelLazySet_DHP, base_wrapped_stat )
@@ -201,7 +201,7 @@ namespace {
 
         set_type s( kSize, 2 );
         test( s );
-        EXPECT_GE( s.statistics().m_nInsertSuccess, 0 );
+        EXPECT_GE( s.statistics().m_nInsertSuccess, 0u );
     }
 
     TEST_F( IntrusiveMichaelLazySet_DHP, member_cmp )
@@ -316,7 +316,7 @@ namespace {
 
         set_type s( kSize, 2 );
         test( s );
-        EXPECT_GE( s.statistics().m_nInsertSuccess, 0 );
+        EXPECT_GE( s.statistics().m_nInsertSuccess, 0u );
     }
 
     TEST_F( IntrusiveMichaelLazySet_DHP, member_wrapped_stat )
@@ -339,7 +339,7 @@ namespace {
 
         set_type s( kSize, 2 );
         test( s );
-        EXPECT_GE( s.statistics().m_nInsertSuccess, 0 );
+        EXPECT_GE( s.statistics().m_nInsertSuccess, 0u );
     }
 
 } // namespace

diff --git a/test/unit/intrusive-set/intrusive_michael_lazy_hp.cpp b/test/unit/intrusive-set/intrusive_michael_lazy_hp.cpp
index 5a833357cbb3b074598dc858261c9c59272c9f81..89c31984928054b8d3d8ad34a5708c8e090ee071 100644 (file)
--- a/test/unit/intrusive-set/intrusive_michael_lazy_hp.cpp
+++ b/test/unit/intrusive-set/intrusive_michael_lazy_hp.cpp
@@ -5,7 +5,7 @@
 
     Source code repo: http://github.com/khizmax/libcds/
     Download: http://sourceforge.net/projects/libcds/files/
-    
+
     Redistribution and use in source and binary forms, with or without
     modification, are permitted provided that the following conditions are met:
 
@@ -179,7 +179,7 @@ namespace {
 
         set_type s( kSize, 2 );
         test( s );
-        EXPECT_GE( s.statistics().m_nInsertSuccess, 0 );
+        EXPECT_GE( s.statistics().m_nInsertSuccess, 0u );
     }
 
     TEST_F( IntrusiveMichaelLazySet_HP, base_wrapped_stat )
@@ -202,7 +202,7 @@ namespace {
 
         set_type s( kSize, 2 );
         test( s );
-        EXPECT_GE( s.statistics().m_nInsertSuccess, 0 );
+        EXPECT_GE( s.statistics().m_nInsertSuccess, 0u );
     }
 
 
@@ -318,7 +318,7 @@ namespace {
 
         set_type s( kSize, 2 );
         test( s );
-        EXPECT_GE( s.statistics().m_nInsertSuccess, 0 );
+        EXPECT_GE( s.statistics().m_nInsertSuccess, 0u );
     }
 
     TEST_F( IntrusiveMichaelLazySet_HP, member_wrapped_stat )
@@ -341,7 +341,7 @@ namespace {
 
         set_type s( kSize, 2 );
         test( s );
-        EXPECT_GE( s.statistics().m_nInsertSuccess, 0 );
+        EXPECT_GE( s.statistics().m_nInsertSuccess, 0u );
     }
 
 } // namespace

diff --git a/test/unit/intrusive-set/intrusive_michael_lazy_nogc.cpp b/test/unit/intrusive-set/intrusive_michael_lazy_nogc.cpp
index 52cc7614428ceab102ed304269bf8c99013107d8..4d86b559b202393f0aef1ad81bc4a1c3f572585d 100644 (file)
--- a/test/unit/intrusive-set/intrusive_michael_lazy_nogc.cpp
+++ b/test/unit/intrusive-set/intrusive_michael_lazy_nogc.cpp
@@ -5,7 +5,7 @@
 
     Source code repo: http://github.com/khizmax/libcds/
     Download: http://sourceforge.net/projects/libcds/files/
-    
+
     Redistribution and use in source and binary forms, with or without
     modification, are permitted provided that the following conditions are met:
 
@@ -165,7 +165,7 @@ namespace {
 
         set_type s( kSize, 2 );
         test( s );
-        EXPECT_GE( s.statistics().m_nInsertSuccess, 0 );
+        EXPECT_GE( s.statistics().m_nInsertSuccess, 0u );
     }
 
     TEST_F( IntrusiveMichaelLazySet_NoGC, base_wrapped_stat )
@@ -188,7 +188,7 @@ namespace {
 
         set_type s( kSize, 2 );
         test( s );
-        EXPECT_GE( s.statistics().m_nInsertSuccess, 0 );
+        EXPECT_GE( s.statistics().m_nInsertSuccess, 0u );
     }
 
     TEST_F( IntrusiveMichaelLazySet_NoGC, member_cmp )
@@ -303,7 +303,7 @@ namespace {
 
         set_type s( kSize, 2 );
         test( s );
-        EXPECT_GE( s.statistics().m_nInsertSuccess, 0 );
+        EXPECT_GE( s.statistics().m_nInsertSuccess, 0u );
     }
 
     TEST_F( IntrusiveMichaelLazySet_NoGC, member_wrapped_stat )
@@ -326,7 +326,7 @@ namespace {
 
         set_type s( kSize, 2 );
         test( s );
-        EXPECT_GE( s.statistics().m_nInsertSuccess, 0 );
+        EXPECT_GE( s.statistics().m_nInsertSuccess, 0u );
     }
 
 } // namespace

diff --git a/test/unit/intrusive-set/intrusive_michael_michael_dhp.cpp b/test/unit/intrusive-set/intrusive_michael_michael_dhp.cpp
index 238705e691379c569ca4cde97f9a403fe2f9069a..fe2d6e8dbd8a34fd49cdb90c22c1eefa1e355b07 100644 (file)
--- a/test/unit/intrusive-set/intrusive_michael_michael_dhp.cpp
+++ b/test/unit/intrusive-set/intrusive_michael_michael_dhp.cpp
@@ -5,7 +5,7 @@
 
     Source code repo: http://github.com/khizmax/libcds/
     Download: http://sourceforge.net/projects/libcds/files/
-    
+
     Redistribution and use in source and binary forms, with or without
     modification, are permitted provided that the following conditions are met:
 
@@ -152,7 +152,7 @@ namespace {
 
         set_type s( kSize, 2 );
         test( s );
-        EXPECT_GE( s.statistics().m_nInsertSuccess, 0 );
+        EXPECT_GE( s.statistics().m_nInsertSuccess, 0u );
     }
 
     TEST_F( IntrusiveMichaelSet_DHP, base_wrapped_stat )
@@ -176,7 +176,7 @@ namespace {
 
         set_type s( kSize, 2 );
         test( s );
-        EXPECT_GE( s.statistics().m_nInsertSuccess, 0 );
+        EXPECT_GE( s.statistics().m_nInsertSuccess, 0u );
     }
 
     TEST_F( IntrusiveMichaelSet_DHP, member_cmp )
@@ -270,7 +270,7 @@ namespace {
 
         set_type s( kSize, 2 );
         test( s );
-        EXPECT_GE( s.statistics().m_nInsertSuccess, 0 );
+        EXPECT_GE( s.statistics().m_nInsertSuccess, 0u );
     }
 
     TEST_F( IntrusiveMichaelSet_DHP, member_wrapped_stat )
@@ -294,7 +294,7 @@ namespace {
 
         set_type s( kSize, 2 );
         test( s );
-        EXPECT_GE( s.statistics().m_nInsertSuccess, 0 );
+        EXPECT_GE( s.statistics().m_nInsertSuccess, 0u );
     }
 
 } // namespace

diff --git a/test/unit/intrusive-set/intrusive_michael_michael_hp.cpp b/test/unit/intrusive-set/intrusive_michael_michael_hp.cpp
index 9c2a3b8f5241ba7e654db6f7ba04e34d60a01ccc..e043cece64c88d7b6b1e5ea6890ef1f75b54b344 100644 (file)
--- a/test/unit/intrusive-set/intrusive_michael_michael_hp.cpp
+++ b/test/unit/intrusive-set/intrusive_michael_michael_hp.cpp
@@ -5,7 +5,7 @@
 
     Source code repo: http://github.com/khizmax/libcds/
     Download: http://sourceforge.net/projects/libcds/files/
-    
+
     Redistribution and use in source and binary forms, with or without
     modification, are permitted provided that the following conditions are met:
 
@@ -153,7 +153,7 @@ namespace {
 
         set_type s( kSize, 2 );
         test( s );
-        EXPECT_GE( s.statistics().m_nInsertSuccess, 0 );
+        EXPECT_GE( s.statistics().m_nInsertSuccess, 0u );
     }
 
     TEST_F( IntrusiveMichaelSet_HP, base_wrapped_stat )
@@ -176,7 +176,7 @@ namespace {
 
         set_type s( kSize, 2 );
         test( s );
-        EXPECT_GE( s.statistics().m_nInsertSuccess, 0 );
+        EXPECT_GE( s.statistics().m_nInsertSuccess, 0u );
     }
 
     TEST_F( IntrusiveMichaelSet_HP, member_cmp )
@@ -270,7 +270,7 @@ namespace {
 
         set_type s( kSize, 2 );
         test( s );
-        EXPECT_GE( s.statistics().m_nInsertSuccess, 0 );
+        EXPECT_GE( s.statistics().m_nInsertSuccess, 0u );
     }
 
     TEST_F( IntrusiveMichaelSet_HP, member_wrapped_stat )
@@ -294,7 +294,7 @@ namespace {
 
         set_type s( kSize, 2 );
         test( s );
-        EXPECT_GE( s.statistics().m_nInsertSuccess, 0 );
+        EXPECT_GE( s.statistics().m_nInsertSuccess, 0u );
     }
 
 } // namespace

diff --git a/test/unit/intrusive-set/intrusive_michael_michael_nogc.cpp b/test/unit/intrusive-set/intrusive_michael_michael_nogc.cpp
index 0d1d8ddef2dc2d314dbd3e92197a27907b19e7a8..72ab511cfb2dcc5e3d0209b8cd7c1355905c928b 100644 (file)
--- a/test/unit/intrusive-set/intrusive_michael_michael_nogc.cpp
+++ b/test/unit/intrusive-set/intrusive_michael_michael_nogc.cpp
@@ -5,7 +5,7 @@
 
     Source code repo: http://github.com/khizmax/libcds/
     Download: http://sourceforge.net/projects/libcds/files/
-    
+
     Redistribution and use in source and binary forms, with or without
     modification, are permitted provided that the following conditions are met:
 
@@ -138,7 +138,7 @@ namespace {
 
         set_type s( kSize, 2 );
         test( s );
-        EXPECT_GE( s.statistics().m_nInsertSuccess, 0 );
+        EXPECT_GE( s.statistics().m_nInsertSuccess, 0u );
     }
 
     TEST_F( IntrusiveMichaelSet_NoGC, base_wrapped_stat )
@@ -161,7 +161,7 @@ namespace {
 
         set_type s( kSize, 2 );
         test( s );
-        EXPECT_GE( s.statistics().m_nInsertSuccess, 0 );
+        EXPECT_GE( s.statistics().m_nInsertSuccess, 0u );
     }
 
     TEST_F( IntrusiveMichaelSet_NoGC, member_cmp )
@@ -254,7 +254,7 @@ namespace {
 
         set_type s( kSize, 2 );
         test( s );
-        EXPECT_GE( s.statistics().m_nInsertSuccess, 0 );
+        EXPECT_GE( s.statistics().m_nInsertSuccess, 0u );
     }
 
     TEST_F( IntrusiveMichaelSet_NoGC, member_wrapped_stat )
@@ -277,7 +277,7 @@ namespace {
 
         set_type s( kSize, 2 );
         test( s );
-        EXPECT_GE( s.statistics().m_nInsertSuccess, 0 );
+        EXPECT_GE( s.statistics().m_nInsertSuccess, 0u );
     }
 
 } // namespace

diff --git a/test/unit/intrusive-set/test_intrusive_feldman_hashset.h b/test/unit/intrusive-set/test_intrusive_feldman_hashset.h
index 0c18fa3ba83818d5b64ee949df7908f8ef33c291..bbcf320e2adf12705ce37524e0751a42736ffd73 100644 (file)
--- a/test/unit/intrusive-set/test_intrusive_feldman_hashset.h
+++ b/test/unit/intrusive-set/test_intrusive_feldman_hashset.h
@@ -191,11 +191,11 @@ namespace cds_test {
                     EXPECT_FALSE( updResult.second );
                     break;
                 case 1:
-                    EXPECT_EQ( i.nInsertCount, 0 );
+                    EXPECT_EQ( i.nInsertCount, 0u );
                     ASSERT_TRUE( s.insert( i, []( value_type& v ) { ++v.nInsertCount;} ));
-                    EXPECT_EQ( i.nInsertCount, 1 );
+                    EXPECT_EQ( i.nInsertCount, 1u );
                     ASSERT_FALSE( s.insert( i, []( value_type& v ) { ++v.nInsertCount;} ) );
-                    EXPECT_EQ( i.nInsertCount, 1 );
+                    EXPECT_EQ( i.nInsertCount, 1u );
                     i.nInsertCount = 0;
                     break;
                 case 2:
@@ -208,7 +208,7 @@ namespace cds_test {
                 ASSERT_TRUE( s.contains( i.nKey ) );
                 EXPECT_EQ( i.nFindCount, 0 );
                 ASSERT_TRUE( s.find( i.nKey, []( value_type& v ) { ++v.nFindCount; } ));
-                EXPECT_EQ( i.nFindCount, 1 );
+                EXPECT_EQ( i.nFindCount, 1u );
             }
             ASSERT_FALSE( s.empty() );
             ASSERT_CONTAINER_SIZE( s, nSetSize );
@@ -230,7 +230,7 @@ namespace cds_test {
                 ASSERT_TRUE( s.contains( i.nKey ) );
                 EXPECT_EQ( i.nFindCount, 0 );
                 ASSERT_TRUE( s.find( i.nKey, []( value_type& v ) { ++v.nFindCount; } ) );
-                EXPECT_EQ( i.nFindCount, 1 );
+                EXPECT_EQ( i.nFindCount, 1u );
 
                 value_type v( i );
                 switch ( i.key() % 3 ) {
@@ -244,11 +244,11 @@ namespace cds_test {
                     ASSERT_FALSE( s.erase( i.key() ) );
                     break;
                 case 2:
-                    EXPECT_EQ( i.nEraseCount, 0 );
+                    EXPECT_EQ( i.nEraseCount, 0u );
                     ASSERT_TRUE( s.erase( v.key(), []( value_type& val ) { ++val.nEraseCount; } ));
-                    EXPECT_EQ( i.nEraseCount, 1 );
+                    EXPECT_EQ( i.nEraseCount, 1u );
                     ASSERT_FALSE( s.erase( v.key(), []( value_type& val ) { ++val.nEraseCount; } ));
-                    EXPECT_EQ( i.nEraseCount, 1 );
+                    EXPECT_EQ( i.nEraseCount, 1u );
                     break;
                 }
 
@@ -261,7 +261,7 @@ namespace cds_test {
             // Force retiring cycle
             Set::gc::force_dispose();
             for ( auto& i : data ) {
-                EXPECT_EQ( i.nDisposeCount, 1 );
+                EXPECT_EQ( i.nDisposeCount, 1u );
             }
 
             // clear
@@ -277,7 +277,7 @@ namespace cds_test {
                 ++it->nFindCount;
             }
             for ( auto it = s.cbegin(); it != s.cend(); ++it ) {
-                EXPECT_EQ( it->nFindCount, 1 );
+                EXPECT_EQ( it->nFindCount, 1u );
             }
 
             // Reverse iterator test
@@ -285,25 +285,25 @@ namespace cds_test {
                 ++it->nFindCount;
             }
             for ( auto it = s.crbegin(); it != s.crend(); ++it ) {
-                EXPECT_EQ( it->nFindCount, 2 );
+                EXPECT_EQ( it->nFindCount, 2u );
             }
 
             for ( auto& i : data ) {
-                EXPECT_EQ( i.nFindCount, 2 );
+                EXPECT_EQ( i.nFindCount, 2u );
             }
 
             // clear test
             s.clear();
 
             ASSERT_TRUE( s.empty());
-            ASSERT_CONTAINER_SIZE( s, 0 );
+            ASSERT_CONTAINER_SIZE( s, 0u );
             ASSERT_TRUE( s.begin() == s.end() );
             ASSERT_TRUE( s.cbegin() == s.cend() );
 
             // Force retiring cycle
             Set::gc::force_dispose();
             for ( auto& i : data ) {
-                EXPECT_EQ( i.nDisposeCount, 1 );
+                EXPECT_EQ( i.nDisposeCount, 1u );
             }
         }
     };

diff --git a/test/unit/intrusive-set/test_intrusive_michael_iterable.h b/test/unit/intrusive-set/test_intrusive_michael_iterable.h
index e1507468ed366c5e4342e4914b2788b59b5eabe5..ec6dc1569742ba717b9519884c5b004189a8cb50 100644 (file)
--- a/test/unit/intrusive-set/test_intrusive_michael_iterable.h
+++ b/test/unit/intrusive-set/test_intrusive_michael_iterable.h
@@ -5,7 +5,7 @@
 
     Source code repo: http://github.com/khizmax/libcds/
     Download: http://sourceforge.net/projects/libcds/files/
-    
+
     Redistribution and use in source and binary forms, with or without
     modification, are permitted provided that the following conditions are met:
 
@@ -265,11 +265,11 @@ namespace cds_test {
                     EXPECT_FALSE( updResult.second );
                     break;
                 case 1:
-                    EXPECT_EQ( i.nUpdateNewCount, 0 );
+                    EXPECT_EQ( i.nUpdateNewCount, 0u );
                     ASSERT_TRUE( s.insert( i, []( value_type& v ) { ++v.nUpdateNewCount;} ));
-                    EXPECT_EQ( i.nUpdateNewCount, 1 );
+                    EXPECT_EQ( i.nUpdateNewCount, 1u );
                     ASSERT_FALSE( s.insert( i, []( value_type& v ) { ++v.nUpdateNewCount;} ) );
-                    EXPECT_EQ( i.nUpdateNewCount, 1 );
+                    EXPECT_EQ( i.nUpdateNewCount, 1u );
                     i.nUpdateNewCount = 0;
                     break;
                 case 2:
@@ -344,18 +344,18 @@ namespace cds_test {
                     ASSERT_FALSE( s.erase_with( other_item( i.key() ), other_less() ) );
                     break;
                 case 4:
-                    EXPECT_EQ( i.nEraseCount, 0 );
+                    EXPECT_EQ( i.nEraseCount, 0u );
                     ASSERT_TRUE( s.erase( v, []( value_type& val ) { ++val.nEraseCount; } ));
-                    EXPECT_EQ( i.nEraseCount, 1 );
+                    EXPECT_EQ( i.nEraseCount, 1u );
                     ASSERT_FALSE( s.erase( v, []( value_type& val ) { ++val.nEraseCount; } ));
-                    EXPECT_EQ( i.nEraseCount, 1 );
+                    EXPECT_EQ( i.nEraseCount, 1u );
                     break;
                 case 5:
-                    EXPECT_EQ( i.nEraseCount, 0 );
+                    EXPECT_EQ( i.nEraseCount, 0u );
                     ASSERT_TRUE( s.erase_with( other_item( i.key() ), other_less(), []( value_type& val ) { ++val.nEraseCount; } ));
-                    EXPECT_EQ( i.nEraseCount, 1 );
+                    EXPECT_EQ( i.nEraseCount, 1u );
                     ASSERT_FALSE( s.erase_with( other_item( i.key() ), other_less(), []( value_type& val ) { ++val.nEraseCount; } ));
-                    EXPECT_EQ( i.nEraseCount, 1 );
+                    EXPECT_EQ( i.nEraseCount, 1u );
                     break;
                 }
 
@@ -373,7 +373,7 @@ namespace cds_test {
             // Force retiring cycle
             Set::gc::force_dispose();
             for ( auto& i : data ) {
-                EXPECT_EQ( i.nDisposeCount, 1 );
+                EXPECT_EQ( i.nDisposeCount, 1u );
             }
 
             // clear
@@ -389,24 +389,24 @@ namespace cds_test {
                 ++it->nFindCount;
             }
             for ( auto it = s.cbegin(); it != s.cend(); ++it ) {
-                EXPECT_EQ( it->nFindCount, 1 );
+                EXPECT_EQ( it->nFindCount, 1u );
             }
             for ( auto& i : data ) {
-                EXPECT_EQ( i.nFindCount, 1 );
+                EXPECT_EQ( i.nFindCount, 1u );
             }
 
             // clear test
             s.clear();
 
             ASSERT_TRUE( s.empty());
-            ASSERT_CONTAINER_SIZE( s, 0 );
+            ASSERT_CONTAINER_SIZE( s, 0u );
             ASSERT_TRUE( s.begin() == s.end() );
             ASSERT_TRUE( s.cbegin() == s.cend() );
 
             // Force retiring cycle
             Set::gc::force_dispose();
             for ( auto& i : data ) {
-                EXPECT_EQ( i.nDisposeCount, 1 );
+                EXPECT_EQ( i.nDisposeCount, 1u );
             }
 
         }

diff --git a/test/unit/misc/bitop.cpp b/test/unit/misc/bitop.cpp
index 58e7339e04e9121c085fb26df9d088c7fd640c61..487575cd76191c7f52feffbd3e2fa7aee44e7e36 100644 (file)
--- a/test/unit/misc/bitop.cpp
+++ b/test/unit/misc/bitop.cpp
@@ -53,7 +53,7 @@ namespace {
             EXPECT_EQ( cds::bitop::MSBnz( n ), nBit - 1 ) << "n=" << n;
             EXPECT_EQ( cds::bitop::LSBnz( n ), nBit - 1 ) << "n=" << n;
             EXPECT_EQ( cds::bitop::SBC( n ), 1 ) << "n=" << n;
-            EXPECT_EQ( cds::bitop::ZBC( n ), sizeof( n ) * 8  - 1 ) << "n=" << n;
+            EXPECT_EQ( cds::bitop::ZBC( n ), static_cast<int>( sizeof( n ) * 8 - 1 )) << "n=" << n;
 
             ++nBit;
         }
@@ -109,15 +109,15 @@ namespace {
 
     TEST_F( bitop, ceil_pow2 )
     {
-        EXPECT_EQ( cds::beans::ceil2( 0 ), 1 );
-        EXPECT_EQ( cds::beans::ceil2( 1 ), 1 );
-        EXPECT_EQ( cds::beans::ceil2( 2 ), 2 );
-        EXPECT_EQ( cds::beans::ceil2( 3 ), 4 );
-        EXPECT_EQ( cds::beans::ceil2( 4 ), 4 );
-        EXPECT_EQ( cds::beans::ceil2( 5 ), 8 );
-        EXPECT_EQ( cds::beans::ceil2( 7 ), 8 );
-        EXPECT_EQ( cds::beans::ceil2( 8 ), 8 );
-        EXPECT_EQ( cds::beans::ceil2( 9 ), 16 );
+        EXPECT_EQ( cds::beans::ceil2( 0 ), 1u );
+        EXPECT_EQ( cds::beans::ceil2( 1 ), 1u );
+        EXPECT_EQ( cds::beans::ceil2( 2 ), 2u );
+        EXPECT_EQ( cds::beans::ceil2( 3 ), 4u );
+        EXPECT_EQ( cds::beans::ceil2( 4 ), 4u );
+        EXPECT_EQ( cds::beans::ceil2( 5 ), 8u );
+        EXPECT_EQ( cds::beans::ceil2( 7 ), 8u );
+        EXPECT_EQ( cds::beans::ceil2( 8 ), 8u );
+        EXPECT_EQ( cds::beans::ceil2( 9 ), 16u );
 
         for ( uint32_t n = 4; n < (uint32_t(1) << 31); n <<= 1 )
         {

diff --git a/test/unit/misc/cxx11_atomic_class.cpp b/test/unit/misc/cxx11_atomic_class.cpp
index 3cf53c045708951f898c52356e9f435507e10a8e..cb9aaca77a9f9aa8703cf830f63ccea32e0704b7 100644 (file)
--- a/test/unit/misc/cxx11_atomic_class.cpp
+++ b/test/unit/misc/cxx11_atomic_class.cpp
@@ -201,7 +201,7 @@ namespace {
 
                 EXPECT_EQ( (a &= (integral_type) ~mask ), ( prev & (integral_type) ~mask ));
                 prev = a;
-                EXPECT_EQ( ( prev & mask), 0);
+                EXPECT_EQ( ( prev & mask), 0u);
 
                 EXPECT_EQ( (a ^= mask ), (prev ^ mask ));
                 prev = a;
@@ -220,8 +220,8 @@ namespace {
 
             EXPECT_TRUE( a.is_lock_free() );
             a.store((integral_type) 0, oStore );
-            EXPECT_EQ( a, 0 );
-            EXPECT_EQ( a.load( oLoad ), 0 );
+            EXPECT_EQ( a, integral_type( 0 ));
+            EXPECT_EQ( a.load( oLoad ), integral_type( 0 ));
 
             for ( size_t nByte = 0; nByte < sizeof(Integral); ++nByte ) {
                 integral_type n = integral_type(42) << (nByte * 8);

diff --git a/test/unit/pqueue/test_fcpqueue.h b/test/unit/pqueue/test_fcpqueue.h
index 404608ed14429d8c7f949845675aecd39c3bc819..20468a04d57c9f26f18d84a11d8dc88d4ae322ac 100644 (file)
--- a/test/unit/pqueue/test_fcpqueue.h
+++ b/test/unit/pqueue/test_fcpqueue.h
@@ -80,13 +80,13 @@ namespace cds_test {
             }
 
             ASSERT_TRUE( !pq.empty() );
-            ASSERT_EQ( pq.size(), 1 );
+            ASSERT_EQ( pq.size(), 1u );
 
             ASSERT_TRUE( pq.pop( kv ) );
             EXPECT_EQ( kv.k, PQueueTest::c_nMinValue );
 
             ASSERT_TRUE( pq.empty() );
-            ASSERT_EQ( pq.size(), 0 );
+            ASSERT_EQ( pq.size(), 0u );
 
             // pop from empty pqueue
             kv.k = PQueueTest::c_nCapacity * 2;
@@ -102,7 +102,7 @@ namespace cds_test {
 
             pq.clear();
             ASSERT_TRUE( pq.empty() );
-            ASSERT_EQ( pq.size(), 0 );
+            ASSERT_EQ( pq.size(), 0u );
         }
     };
 } // namespace cds_test

diff --git a/test/unit/queue/fcqueue.cpp b/test/unit/queue/fcqueue.cpp
index c729edf2486d5bde2bcb58ea22cdc1261dfbfc13..4499db3379b4cc8033890150095443c9679a89c2 100644 (file)
--- a/test/unit/queue/fcqueue.cpp
+++ b/test/unit/queue/fcqueue.cpp
@@ -60,7 +60,7 @@ namespace {
             for ( size_t i = 0; i < nSize; ++i ) {
                 it = -1;
                 ASSERT_TRUE( q.dequeue( it ));
-                ASSERT_EQ( it, i );
+                ASSERT_EQ( it, static_cast<value_type>( i ));
                 ASSERT_EQ( q.size(), nSize - i - 1 );
             }
             ASSERT_TRUE( q.empty() );

diff --git a/test/unit/queue/test_bounded_queue.h b/test/unit/queue/test_bounded_queue.h
index fb721bcd41fdcff0b2c2d2f5d3b655fae0834337..9632c2da2a6d8c8683d3487368abedc306a3c2ba 100644 (file)
--- a/test/unit/queue/test_bounded_queue.h
+++ b/test/unit/queue/test_bounded_queue.h
@@ -61,7 +61,7 @@ namespace cds_test {
             for ( size_t i = 0; i < nSize; ++i ) {
                 it = -1;
                 ASSERT_TRUE( q.dequeue( it ) );
-                ASSERT_EQ( it, i );
+                ASSERT_EQ( it, static_cast<value_type>( i ));
                 ASSERT_CONTAINER_SIZE( q, nSize - i - 1 );
             }
             ASSERT_TRUE( q.empty() );
@@ -111,7 +111,7 @@ namespace cds_test {
                 ASSERT_CONTAINER_SIZE( q, nSize - i - 1 );
             }
             ASSERT_TRUE( q.empty() );
-            ASSERT_CONTAINER_SIZE( q, 0 );
+            ASSERT_CONTAINER_SIZE( q, 0u );
 
             for ( size_t i = 0; i < nSize; ++i ) {
                 ASSERT_TRUE( q.push( static_cast<value_type>(i) ) );
@@ -131,19 +131,19 @@ namespace cds_test {
             // clear
             q.clear();
             ASSERT_TRUE( q.empty() );
-            ASSERT_CONTAINER_SIZE( q, 0 );
+            ASSERT_CONTAINER_SIZE( q, 0u );
 
             // pop from empty queue
             it = static_cast<int>(nSize * 2);
             ASSERT_FALSE( q.pop( it ) );
             ASSERT_EQ( it, nSize * 2 );
             ASSERT_TRUE( q.empty() );
-            ASSERT_CONTAINER_SIZE( q, 0 );
+            ASSERT_CONTAINER_SIZE( q, 0u );
 
             ASSERT_FALSE( q.dequeue( it ) );
             ASSERT_EQ( it, nSize * 2 );
             ASSERT_TRUE( q.empty() );
-            ASSERT_CONTAINER_SIZE( q, 0 );
+            ASSERT_CONTAINER_SIZE( q, 0u );
         }
 
         template <class Queue>

diff --git a/test/unit/queue/test_generic_queue.h b/test/unit/queue/test_generic_queue.h
index 9cc7c9f93a342d9c2e2eb6a79005937df27ddc00..6520347424f7278cd1b565ad3f03eb077dae508a 100644 (file)
--- a/test/unit/queue/test_generic_queue.h
+++ b/test/unit/queue/test_generic_queue.h
@@ -79,7 +79,7 @@ namespace cds_test {
             for ( size_t i = 0; i < nSize; ++i ) {
                 it = -1;
                 ASSERT_TRUE( q.pop( it ) );
-                ASSERT_EQ( it, i );
+                ASSERT_EQ( it, static_cast<value_type>( i ));
                 ASSERT_CONTAINER_SIZE( q, nSize - i - 1 );
             }
             ASSERT_TRUE( q.empty() );

diff --git a/test/unit/set/michael_iterable_dhp.cpp b/test/unit/set/michael_iterable_dhp.cpp
index 9c09643b3a69b3bb7120ca7ebf883327a9240c93..8b8cc035b1a6d458fcd6196eda6a0b6926ac26a3 100644 (file)
--- a/test/unit/set/michael_iterable_dhp.cpp
+++ b/test/unit/set/michael_iterable_dhp.cpp
@@ -5,7 +5,7 @@
 
     Source code repo: http://github.com/khizmax/libcds/
     Download: http://sourceforge.net/projects/libcds/files/
-    
+
     Redistribution and use in source and binary forms, with or without
     modification, are permitted provided that the following conditions are met:
 
@@ -192,7 +192,7 @@ namespace {
 
         set_type s( kSize, 4 );
         test( s );
-        EXPECT_GE( s.statistics().m_nInsertSuccess, 0 );
+        EXPECT_GE( s.statistics().m_nInsertSuccess, 0u );
     }
 
     TEST_F( MichaelIterableSet_DHP, wrapped_stat )
@@ -214,7 +214,7 @@ namespace {
 
         set_type s( kSize, 4 );
         test( s );
-        EXPECT_GE( s.statistics().m_nInsertSuccess, 0 );
+        EXPECT_GE( s.statistics().m_nInsertSuccess, 0u );
     }
 
 } // namespace

diff --git a/test/unit/set/michael_iterable_hp.cpp b/test/unit/set/michael_iterable_hp.cpp
index 444dc68dd457e0f984c7a2ca20a25df6c8ef7881..70fa18672b478a57f2355fd39cf1d9caa9065ec4 100644 (file)
--- a/test/unit/set/michael_iterable_hp.cpp
+++ b/test/unit/set/michael_iterable_hp.cpp
@@ -5,7 +5,7 @@
 
     Source code repo: http://github.com/khizmax/libcds/
     Download: http://sourceforge.net/projects/libcds/files/
-    
+
     Redistribution and use in source and binary forms, with or without
     modification, are permitted provided that the following conditions are met:
 
@@ -193,7 +193,7 @@ namespace {
 
         set_type s( kSize, 4 );
         test( s );
-        EXPECT_GE( s.statistics().m_nInsertSuccess, 0 );
+        EXPECT_GE( s.statistics().m_nInsertSuccess, 0u );
     }
 
     TEST_F( MichaelIterableSet_HP, wrapped_stat )
@@ -215,7 +215,7 @@ namespace {
 
         set_type s( kSize, 4 );
         test( s );
-        EXPECT_GE( s.statistics().m_nInsertSuccess, 0 );
+        EXPECT_GE( s.statistics().m_nInsertSuccess, 0u );
     }
 
 } // namespace

diff --git a/test/unit/set/michael_lazy_dhp.cpp b/test/unit/set/michael_lazy_dhp.cpp
index b362edcafdb27c5314764c4f651f20437561035e..6c742b18e054fdaceed71fcfe6a4fed5e01487c0 100644 (file)
--- a/test/unit/set/michael_lazy_dhp.cpp
+++ b/test/unit/set/michael_lazy_dhp.cpp
@@ -5,7 +5,7 @@
 
     Source code repo: http://github.com/khizmax/libcds/
     Download: http://sourceforge.net/projects/libcds/files/
-    
+
     Redistribution and use in source and binary forms, with or without
     modification, are permitted provided that the following conditions are met:
 
@@ -213,7 +213,7 @@ namespace {
 
         set_type s( kSize, 4 );
         test( s );
-        EXPECT_GE( s.statistics().m_nInsertSuccess, 0 );
+        EXPECT_GE( s.statistics().m_nInsertSuccess, 0u );
     }
 
     TEST_F( MichaelLazySet_DHP, wrapped_stat )
@@ -235,7 +235,7 @@ namespace {
 
         set_type s( kSize, 4 );
         test( s );
-        EXPECT_GE( s.statistics().m_nInsertSuccess, 0 );
+        EXPECT_GE( s.statistics().m_nInsertSuccess, 0u );
     }
 
 } // namespace

diff --git a/test/unit/set/michael_lazy_hp.cpp b/test/unit/set/michael_lazy_hp.cpp
index 88ddd892ec0bbf4d977f7a86de660c0b51e2f7f6..86cf2e9beb5c1d033d912fa4bf1199b4ec7c6b76 100644 (file)
--- a/test/unit/set/michael_lazy_hp.cpp
+++ b/test/unit/set/michael_lazy_hp.cpp
@@ -5,7 +5,7 @@
 
     Source code repo: http://github.com/khizmax/libcds/
     Download: http://sourceforge.net/projects/libcds/files/
-    
+
     Redistribution and use in source and binary forms, with or without
     modification, are permitted provided that the following conditions are met:
 
@@ -214,7 +214,7 @@ namespace {
 
         set_type s( kSize, 4 );
         test( s );
-        EXPECT_GE( s.statistics().m_nInsertSuccess, 0 );
+        EXPECT_GE( s.statistics().m_nInsertSuccess, 0u );
     }
 
     TEST_F( MichaelLazySet_HP, wrapped_stat )
@@ -236,7 +236,7 @@ namespace {
 
         set_type s( kSize, 4 );
         test( s );
-        EXPECT_GE( s.statistics().m_nInsertSuccess, 0 );
+        EXPECT_GE( s.statistics().m_nInsertSuccess, 0u );
     }
 
 } // namespace

diff --git a/test/unit/set/michael_lazy_nogc.cpp b/test/unit/set/michael_lazy_nogc.cpp
index 8a14438de6711e84d08d391310d6912057348e94..dfe7ad15b82fd68b66a4962db8668bbbf3c64d8e 100644 (file)
--- a/test/unit/set/michael_lazy_nogc.cpp
+++ b/test/unit/set/michael_lazy_nogc.cpp
@@ -5,7 +5,7 @@
 
     Source code repo: http://github.com/khizmax/libcds/
     Download: http://sourceforge.net/projects/libcds/files/
-    
+
     Redistribution and use in source and binary forms, with or without
     modification, are permitted provided that the following conditions are met:
 
@@ -204,7 +204,7 @@ namespace {
 
         set_type s( kSize, 4 );
         test( s );
-        EXPECT_GE( s.statistics().m_nInsertSuccess, 0 );
+        EXPECT_GE( s.statistics().m_nInsertSuccess, 0u );
     }
 
     TEST_F( MichaelLazySet_NoGC, wrapped_stat )
@@ -226,7 +226,7 @@ namespace {
 
         set_type s( kSize, 4 );
         test( s );
-        EXPECT_GE( s.statistics().m_nInsertSuccess, 0 );
+        EXPECT_GE( s.statistics().m_nInsertSuccess, 0u );
     }
 
 } // namespace

diff --git a/test/unit/set/michael_michael_dhp.cpp b/test/unit/set/michael_michael_dhp.cpp
index 97a1be2b49dc9138ac48c1a5ff6b65b195a9549f..e4fdc77b8a85134e892f9c9b96bba219e5946cd1 100644 (file)
--- a/test/unit/set/michael_michael_dhp.cpp
+++ b/test/unit/set/michael_michael_dhp.cpp
@@ -5,7 +5,7 @@
 
     Source code repo: http://github.com/khizmax/libcds/
     Download: http://sourceforge.net/projects/libcds/files/
-    
+
     Redistribution and use in source and binary forms, with or without
     modification, are permitted provided that the following conditions are met:
 
@@ -192,7 +192,7 @@ namespace {
 
         set_type s( kSize, 4 );
         test( s );
-        EXPECT_GE( s.statistics().m_nInsertSuccess, 0 );
+        EXPECT_GE( s.statistics().m_nInsertSuccess, 0u );
     }
 
     TEST_F( MichaelSet_DHP, wrapped_stat )
@@ -214,7 +214,7 @@ namespace {
 
         set_type s( kSize, 4 );
         test( s );
-        EXPECT_GE( s.statistics().m_nInsertSuccess, 0 );
+        EXPECT_GE( s.statistics().m_nInsertSuccess, 0u );
     }
 
 } // namespace

diff --git a/test/unit/set/michael_michael_hp.cpp b/test/unit/set/michael_michael_hp.cpp
index 081b3450b57cc74e9338d6ce9cbf1c776fdd638b..779008bb05936dcf23d5822f04290e1795d2665f 100644 (file)
--- a/test/unit/set/michael_michael_hp.cpp
+++ b/test/unit/set/michael_michael_hp.cpp
@@ -5,7 +5,7 @@
 
     Source code repo: http://github.com/khizmax/libcds/
     Download: http://sourceforge.net/projects/libcds/files/
-    
+
     Redistribution and use in source and binary forms, with or without
     modification, are permitted provided that the following conditions are met:
 
@@ -193,7 +193,7 @@ namespace {
 
         set_type s( kSize, 4 );
         test( s );
-        EXPECT_GE( s.statistics().m_nInsertSuccess, 0 );
+        EXPECT_GE( s.statistics().m_nInsertSuccess, 0u );
     }
 
     TEST_F( MichaelSet_HP, wrapped_stat )
@@ -215,7 +215,7 @@ namespace {
 
         set_type s( kSize, 4 );
         test( s );
-        EXPECT_GE( s.statistics().m_nInsertSuccess, 0 );
+        EXPECT_GE( s.statistics().m_nInsertSuccess, 0u );
     }
 
 } // namespace

diff --git a/test/unit/set/michael_michael_nogc.cpp b/test/unit/set/michael_michael_nogc.cpp
index e80662319a8dafd028d3345be456df3880377124..3c97a4e29a91b37fd5ffe97190d6cd97f3cf367c 100644 (file)
--- a/test/unit/set/michael_michael_nogc.cpp
+++ b/test/unit/set/michael_michael_nogc.cpp
@@ -5,7 +5,7 @@
 
     Source code repo: http://github.com/khizmax/libcds/
     Download: http://sourceforge.net/projects/libcds/files/
-    
+
     Redistribution and use in source and binary forms, with or without
     modification, are permitted provided that the following conditions are met:
 
@@ -183,7 +183,7 @@ namespace {
 
         set_type s( kSize, 4 );
         test( s );
-        EXPECT_GE( s.statistics().m_nInsertSuccess, 0 );
+        EXPECT_GE( s.statistics().m_nInsertSuccess, 0u );
     }
 
     TEST_F( MichaelSet_NoGC, wrapped_stat )
@@ -205,7 +205,7 @@ namespace {
 
         set_type s( kSize, 4 );
         test( s );
-        EXPECT_GE( s.statistics().m_nInsertSuccess, 0 );
+        EXPECT_GE( s.statistics().m_nInsertSuccess, 0u );
     }
 
 } // namespace

diff --git a/test/unit/set/test_feldman_hashset.h b/test/unit/set/test_feldman_hashset.h
index b1c76b077af7ad5ad5c52dd07bbb3ff82240abc1..1ee5bbf1bba8098bba6a17e8f935b71f7657ac0b 100644 (file)
--- a/test/unit/set/test_feldman_hashset.h
+++ b/test/unit/set/test_feldman_hashset.h
@@ -5,7 +5,7 @@
 
     Source code repo: http://github.com/khizmax/libcds/
     Download: http://sourceforge.net/projects/libcds/files/
-    
+
     Redistribution and use in source and binary forms, with or without
     modification, are permitted provided that the following conditions are met:
 

diff --git a/test/unit/set/test_feldman_hashset_hp.h b/test/unit/set/test_feldman_hashset_hp.h
index ecc13827980e316aadfa9ea8e3b15e3daa25e3cc..d825dc1e5a05bc8a4728a4fbd8a56db79f490ce6 100644 (file)
--- a/test/unit/set/test_feldman_hashset_hp.h
+++ b/test/unit/set/test_feldman_hashset_hp.h
@@ -5,7 +5,7 @@
 
     Source code repo: http://github.com/khizmax/libcds/
     Download: http://sourceforge.net/projects/libcds/files/
-    
+
     Redistribution and use in source and binary forms, with or without
     modification, are permitted provided that the following conditions are met:
 
@@ -77,7 +77,7 @@ namespace cds_test {
             }
 
             for ( auto it = s.cbegin(); it != s.cend(); ++it ) {
-                EXPECT_EQ( it->nFindCount, it->key() * 3 );
+                EXPECT_EQ( it->nFindCount, static_cast<size_t>( it->key() * 3 ));
             }
 
             // reverse iterator set
@@ -86,7 +86,7 @@ namespace cds_test {
             }
 
             for ( auto it = s.crbegin(); it != s.crend(); ++it ) {
-                EXPECT_EQ( it->nFindCount, it->key() * 2 );
+                EXPECT_EQ( it->nFindCount, static_cast<size_t>( it->key() * 2 ));
             }
 
             typedef typename Set::guarded_ptr guarded_ptr;
@@ -101,7 +101,7 @@ namespace cds_test {
                 gp = s.get( i.key());
                 ASSERT_FALSE( !gp );
                 EXPECT_EQ( gp->key(), i.key() );
-                EXPECT_EQ( gp->nFindCount, i.key() * 2 );
+                EXPECT_EQ( gp->nFindCount, static_cast<size_t>( i.key() * 2 ));
                 gp->nFindCount *= 2;
 
                 gp.release();
@@ -115,7 +115,7 @@ namespace cds_test {
                 gp = s.extract( i.key() );
                 ASSERT_FALSE( !gp );
                 EXPECT_EQ( gp->key(), i.key() );
-                EXPECT_EQ( gp->nFindCount, i.key() * 4 );
+                EXPECT_EQ( gp->nFindCount, static_cast<>size_t( i.key() * 4 ));
 
                 gp = s.extract( i.key() );
                 ASSERT_TRUE( !gp );

diff --git a/test/unit/set/test_feldman_hashset_rcu.h b/test/unit/set/test_feldman_hashset_rcu.h
index 957d9ff8d3b44d871d4501725c13dc5e71e603cf..1ec3628338fb0c0d21c8d3052c74671495648ffa 100644 (file)
--- a/test/unit/set/test_feldman_hashset_rcu.h
+++ b/test/unit/set/test_feldman_hashset_rcu.h
@@ -111,7 +111,7 @@ namespace {
                     value_type * p = s.get( i.key());
                     ASSERT_TRUE( p != nullptr );
                     EXPECT_EQ( p->key(), i.key() );
-                    EXPECT_EQ( p->nFindCount, i.key() * 2 );
+                    EXPECT_EQ( p->nFindCount, static_cast<size_t>( i.key() * 2 ));
                     p->nFindCount *= 2;
                 }
             }
@@ -125,7 +125,7 @@ namespace {
                 xp = s.extract( i.key() );
                 ASSERT_FALSE( !xp );
                 EXPECT_EQ( xp->key(), i.key() );
-                EXPECT_EQ( xp->nFindCount, i.key() * 4 );
+                EXPECT_EQ( xp->nFindCount, static_cast<size_t>( i.key() * 4 ));
 
                 xp = s.extract( i.key() );
                 ASSERT_TRUE( !xp );

diff --git a/test/unit/striped-set/test_intrusive_set.h b/test/unit/striped-set/test_intrusive_set.h
index 82f4e38624ef07c3e73efb908cfe887759281006..a686d6b5ddcc4262581b4d593b080f64e620d82e 100644 (file)
--- a/test/unit/striped-set/test_intrusive_set.h
+++ b/test/unit/striped-set/test_intrusive_set.h
@@ -470,7 +470,7 @@ namespace cds_test {
                 ASSERT_FALSE( s.find_with( other_item( i.key()), other_predicate(), []( value_type&, other_item const& ) {} ));
             }
             ASSERT_TRUE( s.empty() );
-            ASSERT_CONTAINER_SIZE( s, 0 );
+            ASSERT_CONTAINER_SIZE( s, 0u );
 
             // clear
             for ( auto& i : data ) {
@@ -483,7 +483,7 @@ namespace cds_test {
             s.clear();
 
             ASSERT_TRUE( s.empty() );
-            ASSERT_CONTAINER_SIZE( s, 0 );
+            ASSERT_CONTAINER_SIZE( s, 0u );
 
             // clear_and_dispose
             for ( auto& i : data ) {
@@ -498,7 +498,7 @@ namespace cds_test {
             ASSERT_TRUE( s.empty() );
             ASSERT_CONTAINER_SIZE( s, 0 );
             for ( auto& i : data ) {
-                EXPECT_EQ( i.nDisposeCount, 1 );
+                EXPECT_EQ( i.nDisposeCount, 1u );
             }
 
         }

diff --git a/test/unit/striped-set/test_set.h b/test/unit/striped-set/test_set.h
index 15667e60b319645cbe4a44d8e15d6c4702e3d52b..9cc709d63d3c32cfaa5db4fe6bdf58489a971d3d 100644 (file)
--- a/test/unit/striped-set/test_set.h
+++ b/test/unit/striped-set/test_set.h
@@ -354,7 +354,7 @@ namespace cds_test {
                     ASSERT_TRUE( s.find( i.nKey, []( value_type const& v, int key ) 
                         {
                             EXPECT_EQ( v.key(), key );
-                            EXPECT_EQ( v.nFindCount, 1 );
+                            EXPECT_EQ( v.nFindCount, 1u );
                         }));
                     break;
                 case 3:
@@ -363,7 +363,7 @@ namespace cds_test {
                     ASSERT_TRUE( s.find( i.nKey, []( value_type const& v, int key ) 
                         {
                             EXPECT_EQ( v.key(), key );
-                            EXPECT_EQ( v.nFindCount, 1 );
+                            EXPECT_EQ( v.nFindCount, 1u );
                         }));
                     break;
                 case 4:
@@ -388,7 +388,7 @@ namespace cds_test {
                     ASSERT_TRUE( s.find( i.nKey, []( value_type const& v, int key )
                         {
                             EXPECT_EQ( v.key(), key );
-                            EXPECT_EQ( v.nUpdateNewCount, 2 );
+                            EXPECT_EQ( v.nUpdateNewCount, 2u );
                         }));
                     break;
                 case 5:
@@ -413,7 +413,7 @@ namespace cds_test {
                     ASSERT_TRUE( s.find( i, []( value_type const& v, value_type const& arg )
                         {
                             EXPECT_EQ( v.key(), arg.key() );
-                            EXPECT_EQ( v.nUpdateNewCount, 2 );
+                            EXPECT_EQ( v.nUpdateNewCount, 2u );
                         }));
                     break;
                 case 6:
@@ -465,11 +465,11 @@ namespace cds_test {
                     }));
                 ASSERT_TRUE( s.find( i, []( value_type& v, value_type const& ) 
                     { 
-                        EXPECT_EQ( ++v.nFindCount, 2 );
+                        EXPECT_EQ( ++v.nFindCount, 2u );
                     }));
                 ASSERT_TRUE( s.find_with( other_item( i.key() ), other_predicate(), []( value_type& v, other_item const& )
                     { 
-                        EXPECT_EQ( ++v.nFindCount, 3 );
+                        EXPECT_EQ( ++v.nFindCount, 3u );
                     }));
 
                 int nKey = i.key() - 1;
@@ -538,7 +538,7 @@ namespace cds_test {
                 ASSERT_FALSE( s.find_with( other_item( i.key()), other_predicate(), []( value_type&, other_item const& ) {} ));
             }
             ASSERT_TRUE( s.empty() );
-            ASSERT_CONTAINER_SIZE( s, 0 );
+            ASSERT_CONTAINER_SIZE( s, 0u );
 
 
             // clear
@@ -552,7 +552,7 @@ namespace cds_test {
             s.clear();
 
             ASSERT_TRUE( s.empty() );
-            ASSERT_CONTAINER_SIZE( s, 0 );
+            ASSERT_CONTAINER_SIZE( s, 0u );
         }
     };