From 744211978eaf0cbcd9139d07b8dfd6f72651b39f Mon Sep 17 00:00:00 2001 From: khizmax Date: Sun, 25 Sep 2016 08:44:02 +0300 Subject: [PATCH] Fixed minor gcc warnings --- CMakeLists.txt | 4 +-- cds/intrusive/impl/ellen_bintree.h | 4 ++- projects/Win/vc14/gtest-map.vcxproj.filters | 4 --- .../Win/vc14/gtest-pqueue.vcxproj.filters | 4 --- projects/Win/vc14/gtest-queue.vcxproj.filters | 4 --- test/stress/framework/city.cpp | 2 +- test/stress/map/delodd/map_delodd.h | 4 +-- .../map/insdel_string/map_insdel_string.cpp | 4 +-- test/stress/stack/intrusive_stack_push_pop.h | 6 ++-- test/stress/stack/push_pop.cpp | 2 +- .../intrusive_feldman_hashset_hp.cpp | 4 +-- .../intrusive_michael_iterable_dhp.cpp | 6 ++-- .../intrusive_michael_iterable_hp.cpp | 6 ++-- .../test_intrusive_feldman_hashset.h | 6 ++-- .../test_intrusive_feldman_hashset_hp.h | 16 ++++----- .../test_intrusive_feldman_hashset_rcu.h | 14 ++++---- .../test_intrusive_michael_iterable_hp.h | 14 ++++---- test/unit/intrusive-set/test_intrusive_set.h | 12 +++---- .../intrusive-set/test_intrusive_set_nogc.h | 6 ++-- .../intrusive-set/test_intrusive_set_rcu.h | 22 ++++++------ test/unit/list/test_intrusive_lazy_rcu.h | 2 +- test/unit/list/test_kv_iterable_list.h | 4 +-- test/unit/list/test_kv_list.h | 6 ++-- test/unit/map/feldman_hashmap_dhp.cpp | 4 +-- test/unit/map/feldman_hashmap_hp.cpp | 24 ++++++------- test/unit/map/test_feldman_hashmap.h | 10 +++--- test/unit/map/test_feldman_hashmap_hp.h | 6 ++-- test/unit/map/test_map.h | 2 +- test/unit/map/test_map_nogc.h | 10 +++--- test/unit/map/test_michael_iterable.h | 8 ++--- test/unit/misc/bitop.cpp | 22 ++++++------ test/unit/misc/cxx11_atomic_class.cpp | 16 ++++----- test/unit/misc/cxx11_atomic_func.cpp | 16 ++++----- test/unit/misc/permutation_generator.cpp | 8 ++--- test/unit/pqueue/mspqueue.cpp | 12 +++---- test/unit/pqueue/test_fcpqueue.h | 6 ++-- test/unit/queue/fcqueue.cpp | 18 +++++----- test/unit/queue/test_generic_queue.h | 6 ++-- test/unit/queue/test_segmented_queue.h | 4 +-- test/unit/set/test_feldman_hashset_rcu.h | 8 ++--- test/unit/set/test_set.h | 6 ++-- test/unit/stack/fcstack.cpp | 20 +++++------ test/unit/striped-map/test_map.h | 10 +++--- test/unit/striped-map/test_striped_map.h | 10 +++--- test/unit/striped-set/test_intrusive_set.h | 36 +++++++++---------- .../striped-set/test_intrusive_striped_set.h | 4 +-- test/unit/striped-set/test_set.h | 6 ++-- test/unit/striped-set/test_striped_set.h | 6 ++-- test/unit/tree/test_bronson_avltree_map_ptr.h | 16 ++++----- test/unit/tree/test_intrusive_tree.h | 8 ++--- test/unit/tree/test_tree_map.h | 10 +++--- test/unit/tree/test_tree_set.h | 18 +++++----- test/unit/tree/test_tree_set_hp.h | 6 ++-- 53 files changed, 241 insertions(+), 251 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d6096271..b059ad37 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -83,8 +83,8 @@ if(CMAKE_COMPILER_IS_GNUCXX) if(CMAKE_TARGET_ARCHITECTURE STREQUAL "x86_64") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mcx16") endif() - if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "6.0.0") -# gcc 4.8: disable noise -Wunused-local-typedefs -Wno-unused-parameter + if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "7.0.0") +# gcc 4.8 - 6: disable noise -Wunused-local-typedefs set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-local-typedefs") endif() endif() diff --git a/cds/intrusive/impl/ellen_bintree.h b/cds/intrusive/impl/ellen_bintree.h index be8f88b0..6efca113 100644 --- a/cds/intrusive/impl/ellen_bintree.h +++ b/cds/intrusive/impl/ellen_bintree.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: @@ -1568,6 +1568,8 @@ namespace cds { namespace intrusive { template guarded_ptr get_with_( Q const& val, Less pred ) const { + CDS_UNUSED( pred ); + typedef ellen_bintree::details::compare< key_type, value_type, diff --git a/projects/Win/vc14/gtest-map.vcxproj.filters b/projects/Win/vc14/gtest-map.vcxproj.filters index e25cb3a7..5b66b743 100644 --- a/projects/Win/vc14/gtest-map.vcxproj.filters +++ b/projects/Win/vc14/gtest-map.vcxproj.filters @@ -9,10 +9,6 @@ {93995380-89BD-4b04-88EB-625FBE52EBFB} h;hh;hpp;hxx;hm;inl;inc;xsd - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - {12baf500-5c1c-44a7-9bac-e0554eb93b1a} diff --git a/projects/Win/vc14/gtest-pqueue.vcxproj.filters b/projects/Win/vc14/gtest-pqueue.vcxproj.filters index d7dd0581..673de935 100644 --- a/projects/Win/vc14/gtest-pqueue.vcxproj.filters +++ b/projects/Win/vc14/gtest-pqueue.vcxproj.filters @@ -9,10 +9,6 @@ {93995380-89BD-4b04-88EB-625FBE52EBFB} h;hh;hpp;hxx;hm;inl;inc;xsd - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - diff --git a/projects/Win/vc14/gtest-queue.vcxproj.filters b/projects/Win/vc14/gtest-queue.vcxproj.filters index 133fc42c..386c2fe0 100644 --- a/projects/Win/vc14/gtest-queue.vcxproj.filters +++ b/projects/Win/vc14/gtest-queue.vcxproj.filters @@ -9,10 +9,6 @@ {93995380-89BD-4b04-88EB-625FBE52EBFB} h;hh;hpp;hxx;hm;inl;inc;xsd - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - diff --git a/test/stress/framework/city.cpp b/test/stress/framework/city.cpp index bb4b3406..aeac8e5d 100644 --- a/test/stress/framework/city.cpp +++ b/test/stress/framework/city.cpp @@ -153,7 +153,7 @@ static uint32 Hash32Len13to24(const char *s, size_t len) { static uint32 Hash32Len0to4(const char *s, size_t len) { uint32 b = 0; uint32 c = 9; - for (int i = 0; i < len; i++) { + for (size_t i = 0; i < len; i++) { signed char v = s[i]; b = b * c1 + v; c ^= b; diff --git a/test/stress/map/delodd/map_delodd.h b/test/stress/map/delodd/map_delodd.h index 158119ed..92ec10b1 100644 --- a/test/stress/map/delodd/map_delodd.h +++ b/test/stress/map/delodd/map_delodd.h @@ -593,7 +593,7 @@ namespace map { } EXPECT_EQ( nInsertSuccess, s_nMapSize * s_nInsThreadCount ); - EXPECT_EQ( nInsertFailed, 0 ); + EXPECT_EQ( nInsertFailed, 0u ); propout() << std::make_pair( "insert_success", nInsertSuccess ) @@ -665,7 +665,7 @@ namespace map { } EXPECT_EQ( nInsertSuccess, s_nMapSize * s_nInsThreadCount ); - EXPECT_EQ( nInsertFailed, 0 ); + EXPECT_EQ( nInsertFailed, 0u ); propout() << std::make_pair( "insert_success", nInsertSuccess ) diff --git a/test/stress/map/insdel_string/map_insdel_string.cpp b/test/stress/map/insdel_string/map_insdel_string.cpp index df8a2f17..c051e222 100644 --- a/test/stress/map/insdel_string/map_insdel_string.cpp +++ b/test/stress/map/insdel_string/map_insdel_string.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: @@ -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. */ #include "map_insdel_string.h" diff --git a/test/stress/stack/intrusive_stack_push_pop.h b/test/stress/stack/intrusive_stack_push_pop.h index 7770d479..4c7804ca 100644 --- a/test/stress/stack/intrusive_stack_push_pop.h +++ b/test/stress/stack/intrusive_stack_push_pop.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. */ #include "intrusive_stack_type.h" @@ -199,7 +199,7 @@ namespace cds_test { protected: template - void analyze( Stack& stack ) + void analyze( Stack& /*stack*/ ) { cds_test::thread_pool& pool = get_pool(); diff --git a/test/stress/stack/push_pop.cpp b/test/stress/stack/push_pop.cpp index b5de115e..1c0654a1 100644 --- a/test/stress/stack/push_pop.cpp +++ b/test/stress/stack/push_pop.cpp @@ -230,7 +230,7 @@ namespace { } template< class Stack> - void analyze( Stack& stack ) + void analyze( Stack& /*stack*/ ) { cds_test::thread_pool& pool = get_pool(); diff --git a/test/unit/intrusive-set/intrusive_feldman_hashset_hp.cpp b/test/unit/intrusive-set/intrusive_feldman_hashset_hp.cpp index e9ca7b5e..25ed60d9 100644 --- a/test/unit/intrusive-set/intrusive_feldman_hashset_hp.cpp +++ b/test/unit/intrusive-set/intrusive_feldman_hashset_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: @@ -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. */ #include "test_intrusive_feldman_hashset_hp.h" diff --git a/test/unit/intrusive-set/intrusive_michael_iterable_dhp.cpp b/test/unit/intrusive-set/intrusive_michael_iterable_dhp.cpp index 50753454..19f14f8c 100644 --- a/test/unit/intrusive-set/intrusive_michael_iterable_dhp.cpp +++ b/test/unit/intrusive-set/intrusive_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: @@ -142,7 +142,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( IntrusiveMichaelIterableSet_DHP, wrapped_stat ) @@ -164,7 +164,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_iterable_hp.cpp b/test/unit/intrusive-set/intrusive_michael_iterable_hp.cpp index 4ed2bb89..2554ceff 100644 --- a/test/unit/intrusive-set/intrusive_michael_iterable_hp.cpp +++ b/test/unit/intrusive-set/intrusive_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: @@ -144,7 +144,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( IntrusiveMichaelIterableSet_HP, wrapped_stat ) @@ -167,7 +167,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 bb3ae721..0c18fa3b 100644 --- a/test/unit/intrusive-set/test_intrusive_feldman_hashset.h +++ b/test/unit/intrusive-set/test_intrusive_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: @@ -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 CDSUNIT_SET_TEST_INTRUSIVE_FELDMAN_HASHSET_H @@ -219,7 +219,7 @@ namespace cds_test { { std::vector< typename Set::level_statistics > level_stat; s.get_level_statistics( level_stat ); - EXPECT_GT( level_stat.size(), 0 ); + EXPECT_GT( level_stat.size(), 0u ); } // erase diff --git a/test/unit/intrusive-set/test_intrusive_feldman_hashset_hp.h b/test/unit/intrusive-set/test_intrusive_feldman_hashset_hp.h index 17dd9ec9..9036861d 100644 --- a/test/unit/intrusive-set/test_intrusive_feldman_hashset_hp.h +++ b/test/unit/intrusive-set/test_intrusive_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: @@ -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 CDSUNIT_SET_TEST_INTRUSIVE_FELDMAN_HASHSET_HP_H @@ -88,16 +88,16 @@ namespace cds_test { for ( auto idx : indices ) { auto& i = data[idx]; - EXPECT_EQ( i.nFindCount, 0 ); + EXPECT_EQ( i.nFindCount, 0u ); gp = s.get( i.key() ); ASSERT_FALSE( !gp ); ++gp->nFindCount; - EXPECT_EQ( i.nFindCount, 1 ); + EXPECT_EQ( i.nFindCount, 1u ); gp = s.extract( i.key()); ASSERT_FALSE( !gp ); ++gp->nEraseCount; - EXPECT_EQ( i.nEraseCount, 1 ); + EXPECT_EQ( i.nEraseCount, 1u ); gp = s.extract( i.key() ); ASSERT_TRUE( !gp ); @@ -113,7 +113,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 ); } // erase_at( iterator ) @@ -134,7 +134,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 ); } // erase_at( reverse_iterator ) @@ -155,7 +155,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 ); } } }; diff --git a/test/unit/intrusive-set/test_intrusive_feldman_hashset_rcu.h b/test/unit/intrusive-set/test_intrusive_feldman_hashset_rcu.h index a8db5437..d7af35ca 100644 --- a/test/unit/intrusive-set/test_intrusive_feldman_hashset_rcu.h +++ b/test/unit/intrusive-set/test_intrusive_feldman_hashset_rcu.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 CDSUNIT_SET_TEST_INTRUSIVE_FELDMAN_HASHSET_RCU_H @@ -100,18 +100,18 @@ protected: { rcu_lock l; - EXPECT_EQ( i.nFindCount, 0 ); + EXPECT_EQ( i.nFindCount, 0u ); rp = s.get( i.key() ); ASSERT_FALSE( !rp ); ++rp->nFindCount; - EXPECT_EQ( i.nFindCount, 1 ); + EXPECT_EQ( i.nFindCount, 1u ); } - EXPECT_EQ( i.nEraseCount, 0 ); + EXPECT_EQ( i.nEraseCount, 0u ); xp = s.extract( i.key()); ASSERT_FALSE( !xp ); ++xp->nEraseCount; - EXPECT_EQ( i.nEraseCount, 1 ); + EXPECT_EQ( i.nEraseCount, 1u ); xp = s.extract( i.key() ); ASSERT_TRUE( !xp ); @@ -123,7 +123,7 @@ protected: // 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_hp.h b/test/unit/intrusive-set/test_intrusive_michael_iterable_hp.h index 65621cf0..13f08552 100644 --- a/test/unit/intrusive-set/test_intrusive_michael_iterable_hp.h +++ b/test/unit/intrusive-set/test_intrusive_michael_iterable_hp.h @@ -101,23 +101,23 @@ namespace cds_test { for ( auto idx : indices ) { auto& i = data[idx]; - EXPECT_EQ( i.nFindCount, 0 ); + EXPECT_EQ( i.nFindCount, 0u ); gp = s.get( i ); ASSERT_FALSE( !gp ); ++gp->nFindCount; - EXPECT_EQ( i.nFindCount, 1 ); + EXPECT_EQ( i.nFindCount, 1u ); gp = s.get( i.key() ); ASSERT_FALSE( !gp ); ++gp->nFindCount; - EXPECT_EQ( i.nFindCount, 2 ); + EXPECT_EQ( i.nFindCount, 2u ); gp = s.get_with( other_item( i.key()), other_less()); ASSERT_FALSE( !gp ); ++gp->nFindCount; - EXPECT_EQ( i.nFindCount, 3 ); + EXPECT_EQ( i.nFindCount, 3u ); - EXPECT_EQ( i.nEraseCount, 0 ); + EXPECT_EQ( i.nEraseCount, 0u ); switch ( i.key() % 3 ) { case 0: gp = s.extract( i.key()); @@ -131,7 +131,7 @@ namespace cds_test { } ASSERT_FALSE( !gp ); ++gp->nEraseCount; - EXPECT_EQ( i.nEraseCount, 1 ); + EXPECT_EQ( i.nEraseCount, 1u ); gp = s.extract( i ); ASSERT_TRUE( !gp ); @@ -149,7 +149,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 ); } } diff --git a/test/unit/intrusive-set/test_intrusive_set.h b/test/unit/intrusive-set/test_intrusive_set.h index d4ed3035..44e1aa4d 100644 --- a/test/unit/intrusive-set/test_intrusive_set.h +++ b/test/unit/intrusive-set/test_intrusive_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: @@ -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 CDSUNIT_SET_TEST_INTRUSIVE_SET_H @@ -293,7 +293,7 @@ namespace cds_test { std::pair updResult; - updResult = s.update( i, []( bool bNew, value_type&, value_type& ) + updResult = s.update( i, []( bool, value_type&, value_type& ) { ASSERT_TRUE( false ); }, false ); @@ -353,11 +353,11 @@ namespace cds_test { ASSERT_TRUE( s.contains( i.nKey ) ); ASSERT_TRUE( s.contains( i ) ); ASSERT_TRUE( s.contains( other_item( i.key() ), other_less() ) ); - EXPECT_EQ( i.nFindCount, 0 ); + EXPECT_EQ( i.nFindCount, 0u ); ASSERT_TRUE( s.find( i.nKey, []( value_type& v, int ) { ++v.nFindCount; } ) ); - EXPECT_EQ( i.nFindCount, 1 ); + EXPECT_EQ( i.nFindCount, 1u ); ASSERT_TRUE( s.find_with( other_item( i.key() ), other_less(), []( value_type& v, other_item const& ) { ++v.nFindCount; } ) ); - EXPECT_EQ( i.nFindCount, 2 ); + EXPECT_EQ( i.nFindCount, 2u ); value_type v( i ); switch ( i.key() % 6 ) { diff --git a/test/unit/intrusive-set/test_intrusive_set_nogc.h b/test/unit/intrusive-set/test_intrusive_set_nogc.h index 46e06a55..287807d3 100644 --- a/test/unit/intrusive-set/test_intrusive_set_nogc.h +++ b/test/unit/intrusive-set/test_intrusive_set_nogc.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 CDSUNIT_SET_TEST_INTRUSIVE_SET_NOGC_H @@ -292,7 +292,7 @@ namespace cds_test { std::pair updResult; - updResult = s.update( i, []( bool bNew, value_type&, value_type& ) + updResult = s.update( i, []( bool, value_type&, value_type& ) { ASSERT_TRUE( false ); }, false ); diff --git a/test/unit/intrusive-set/test_intrusive_set_rcu.h b/test/unit/intrusive-set/test_intrusive_set_rcu.h index ff28bef3..c82e5741 100644 --- a/test/unit/intrusive-set/test_intrusive_set_rcu.h +++ b/test/unit/intrusive-set/test_intrusive_set_rcu.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 CDSUNIT_SET_TEST_INTRUSIVE_SET_RCU_H @@ -120,28 +120,28 @@ namespace cds_test { { rcu_lock l; - EXPECT_EQ( i.nFindCount, 0 ); + EXPECT_EQ( i.nFindCount, 0u ); rp = s.get( i ); ASSERT_FALSE( !rp ); ++rp->nFindCount; - EXPECT_EQ( i.nFindCount, 1 ); + EXPECT_EQ( i.nFindCount, 1u ); rp = s.get( i.key() ); ASSERT_FALSE( !rp ); ++rp->nFindCount; - EXPECT_EQ( i.nFindCount, 2 ); + EXPECT_EQ( i.nFindCount, 2u ); rp = s.get_with( other_item( i.key()), other_less()); ASSERT_FALSE( !rp ); ++rp->nFindCount; - EXPECT_EQ( i.nFindCount, 3 ); + EXPECT_EQ( i.nFindCount, 3u ); } if ( Set::c_bExtractLockExternal ) { { rcu_lock l; - EXPECT_EQ( i.nEraseCount, 0 ); + EXPECT_EQ( i.nEraseCount, 0u ); switch ( i.key() % 3 ) { case 0: xp = s.extract( i.key()); @@ -156,7 +156,7 @@ namespace cds_test { ASSERT_FALSE( !xp ); ++xp->nEraseCount; } - EXPECT_EQ( i.nEraseCount, 1 ); + EXPECT_EQ( i.nEraseCount, 1u ); xp.release(); { @@ -171,7 +171,7 @@ namespace cds_test { } } else { - EXPECT_EQ( i.nEraseCount, 0 ); + EXPECT_EQ( i.nEraseCount, 0u ); switch ( i.key() % 3 ) { case 0: xp = s.extract( i.key()); @@ -185,7 +185,7 @@ namespace cds_test { } ASSERT_FALSE( !xp ); ++xp->nEraseCount; - EXPECT_EQ( i.nEraseCount, 1 ); + EXPECT_EQ( i.nEraseCount, 1u ); xp = s.extract( i ); ASSERT_TRUE( !xp ); @@ -202,7 +202,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 ); } } }; diff --git a/test/unit/list/test_intrusive_lazy_rcu.h b/test/unit/list/test_intrusive_lazy_rcu.h index 2eaf7f72..bb8e5fcb 100644 --- a/test/unit/list/test_intrusive_lazy_rcu.h +++ b/test/unit/list/test_intrusive_lazy_rcu.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/list/test_kv_iterable_list.h b/test/unit/list/test_kv_iterable_list.h index d97f27c6..87c533fc 100644 --- a/test/unit/list/test_kv_iterable_list.h +++ b/test/unit/list/test_kv_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: @@ -237,7 +237,7 @@ namespace cds_test { case 4: { - auto pair = l.update( i.key, []( list_value_type& n, list_value_type* old ) { + auto pair = l.update( i.key, []( list_value_type&, list_value_type* ) { ASSERT_TRUE( false ); }, false ); EXPECT_FALSE( pair.first ); diff --git a/test/unit/list/test_kv_list.h b/test/unit/list/test_kv_list.h index ee87209e..2611954a 100644 --- a/test/unit/list/test_kv_list.h +++ b/test/unit/list/test_kv_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: @@ -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 CDSUNIT_LIST_TEST_KV_LIST_H @@ -234,7 +234,7 @@ namespace cds_test { break; case 4: { - auto pair = l.update( i.key, []( bool bNew, list_value_type& n ) { + auto pair = l.update( i.key, []( bool, list_value_type& ) { ASSERT_TRUE( false ); }, false ); EXPECT_FALSE( pair.first ); diff --git a/test/unit/map/feldman_hashmap_dhp.cpp b/test/unit/map/feldman_hashmap_dhp.cpp index 3a97d78a..aa58903e 100644 --- a/test/unit/map/feldman_hashmap_dhp.cpp +++ b/test/unit/map/feldman_hashmap_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: @@ -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. */ #include "test_feldman_hashmap_hp.h" diff --git a/test/unit/map/feldman_hashmap_hp.cpp b/test/unit/map/feldman_hashmap_hp.cpp index 92766e50..dd25281e 100644 --- a/test/unit/map/feldman_hashmap_hp.cpp +++ b/test/unit/map/feldman_hashmap_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: @@ -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. */ #include "test_feldman_hashmap_hp.h" @@ -74,8 +74,8 @@ namespace { > map_type; map_type m( 4, 5 ); - EXPECT_GE( m.head_size(), 1 << 4 ); - EXPECT_EQ( m.array_node_size(), 1 << 5 ); + EXPECT_GE( m.head_size(), static_cast( 1 << 4 )); + EXPECT_EQ( m.array_node_size(), static_cast( 1 << 5 )); test( m ); } @@ -88,8 +88,8 @@ namespace { > map_type; map_type m( 3, 2 ); - EXPECT_GE( m.head_size(), 1 << 4 ); // min = 2 ** 4 - EXPECT_EQ( m.array_node_size(), 1 << 2 ); + EXPECT_GE( m.head_size(), static_cast( 1 << 4 )); // min = 2 ** 4 + EXPECT_EQ( m.array_node_size(), static_cast( 1 << 2 )); test( m ); } @@ -103,8 +103,8 @@ namespace { > map_type; map_type m( 4, 4 ); - EXPECT_EQ( m.head_size(), 1 << 4 ); - EXPECT_EQ( m.array_node_size(), 1 << 4 ); + EXPECT_EQ( m.head_size(), static_cast( 1 << 4 )); + EXPECT_EQ( m.array_node_size(), static_cast( 1 << 4 )); test( m ); } @@ -119,8 +119,8 @@ namespace { typedef cc::FeldmanHashMap< gc_type, key_type, value_type, map_traits > map_type; map_type m( 8, 2 ); - EXPECT_EQ( m.head_size(), 1 << 8 ); - EXPECT_EQ( m.array_node_size(), 1 << 2 ); + EXPECT_EQ( m.head_size(), static_cast( 1 << 8 )); + EXPECT_EQ( m.array_node_size(), static_cast( 1 << 2 )); test( m ); } @@ -134,8 +134,8 @@ namespace { typedef cc::FeldmanHashMap< gc_type, key_type, value_type, map_traits > map_type; map_type m( 1, 1 ); - EXPECT_EQ( m.head_size(), 1 << 4 ); // min = 2**4 - EXPECT_EQ( m.array_node_size(), 1 << 2 ); // min = 2**2 + EXPECT_EQ( m.head_size(), static_cast( 1 << 4 )); // min = 2**4 + EXPECT_EQ( m.array_node_size(), static_cast( 1 << 2 )); // min = 2**2 test( m ); } diff --git a/test/unit/map/test_feldman_hashmap.h b/test/unit/map/test_feldman_hashmap.h index 47703c6e..ea782227 100644 --- a/test/unit/map/test_feldman_hashmap.h +++ b/test/unit/map/test_feldman_hashmap.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 CDSUNIT_MAP_TEST_FELDMAN_HASHMAP_H @@ -128,7 +128,7 @@ namespace cds_test { v.second.nVal = v.first.nKey; v.second.strVal = std::to_string( v.first.nKey ); } ) ); - ASSERT_FALSE( m.insert_with( i, []( map_pair& v ) { + ASSERT_FALSE( m.insert_with( i, []( map_pair& ) { EXPECT_TRUE( false ); } ) ); break; @@ -137,7 +137,7 @@ namespace cds_test { v.second.nVal = v.first.nKey; v.second.strVal = std::to_string( v.first.nKey ); } ) ); - ASSERT_FALSE( m.insert_with( i.nKey, []( map_pair& v ) { + ASSERT_FALSE( m.insert_with( i.nKey, []( map_pair& ) { EXPECT_TRUE( false ); } ) ); break; @@ -146,7 +146,7 @@ namespace cds_test { v.second.nVal = v.first.nKey; v.second.strVal = std::to_string( v.first.nKey ); } ) ); - ASSERT_FALSE( m.insert_with( val.strVal, []( map_pair& v ) { + ASSERT_FALSE( m.insert_with( val.strVal, []( map_pair& ) { EXPECT_TRUE( false ); } ) ); break; diff --git a/test/unit/map/test_feldman_hashmap_hp.h b/test/unit/map/test_feldman_hashmap_hp.h index 004f30ae..0c55aaa6 100644 --- a/test/unit/map/test_feldman_hashmap_hp.h +++ b/test/unit/map/test_feldman_hashmap_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: @@ -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 CDSUNIT_MAP_TEST_FELDMAN_HASHMAP_HP_H @@ -51,7 +51,7 @@ namespace cds_test { ASSERT_TRUE( m.empty()); ASSERT_CONTAINER_SIZE( m, 0 ); - typedef typename Map::value_type map_pair; + //typedef typename Map::value_type map_pair; size_t const kkSize = base_class::kSize; std::vector arrKeys; diff --git a/test/unit/map/test_map.h b/test/unit/map/test_map.h index 658a2269..b8c86477 100644 --- a/test/unit/map/test_map.h +++ b/test/unit/map/test_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/test/unit/map/test_map_nogc.h b/test/unit/map/test_map_nogc.h index cc8abb93..9f5df9b0 100644 --- a/test/unit/map/test_map_nogc.h +++ b/test/unit/map/test_map_nogc.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 CDSUNIT_MAP_TEST_MAP_NOGC_H @@ -124,7 +124,7 @@ namespace cds_test { v.second.strVal = std::to_string( v.first.nKey ); } ); ASSERT_FALSE( it == m.end() ); - ASSERT_TRUE( m.insert_with( i, []( map_pair& v ) { + ASSERT_TRUE( m.insert_with( i, []( map_pair& ) { EXPECT_TRUE( false ); } ) == m.end()); break; @@ -134,7 +134,7 @@ namespace cds_test { v.second.strVal = std::to_string( v.first.nKey ); } ); ASSERT_FALSE( it == m.end() ); - ASSERT_TRUE( m.insert_with( i.nKey, []( map_pair& v ) { + ASSERT_TRUE( m.insert_with( i.nKey, []( map_pair& ) { EXPECT_TRUE( false ); } ) == m.end()); break; @@ -144,7 +144,7 @@ namespace cds_test { v.second.strVal = std::to_string( v.first.nKey ); } ); ASSERT_FALSE( it == m.end() ); - ASSERT_TRUE( m.insert_with( val.strVal, []( map_pair& v ) { + ASSERT_TRUE( m.insert_with( val.strVal, []( map_pair& ) { EXPECT_TRUE( false ); } ) == m.end()); break; diff --git a/test/unit/map/test_michael_iterable.h b/test/unit/map/test_michael_iterable.h index 54e22862..0bc7b527 100644 --- a/test/unit/map/test_michael_iterable.h +++ b/test/unit/map/test_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: @@ -130,7 +130,7 @@ namespace cds_test { v.second.nVal = v.first.nKey; v.second.strVal = std::to_string( v.first.nKey ); } )); - EXPECT_FALSE( m.insert_with( i, []( map_pair& v ) { + EXPECT_FALSE( m.insert_with( i, []( map_pair& ) { EXPECT_TRUE( false ); } )); break; @@ -139,7 +139,7 @@ namespace cds_test { v.second.nVal = v.first.nKey; v.second.strVal = std::to_string( v.first.nKey ); } )); - EXPECT_FALSE( m.insert_with( i.nKey, []( map_pair& v ) { + EXPECT_FALSE( m.insert_with( i.nKey, []( map_pair& ) { EXPECT_TRUE( false ); } )); break; @@ -148,7 +148,7 @@ namespace cds_test { v.second.nVal = v.first.nKey; v.second.strVal = std::to_string( v.first.nKey ); } )); - EXPECT_FALSE( m.insert_with( val.strVal, []( map_pair& v ) { + EXPECT_FALSE( m.insert_with( val.strVal, []( map_pair& ) { EXPECT_TRUE( false ); } )); break; diff --git a/test/unit/misc/bitop.cpp b/test/unit/misc/bitop.cpp index 54670dc0..58e7339e 100644 --- a/test/unit/misc/bitop.cpp +++ b/test/unit/misc/bitop.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: @@ -44,7 +44,7 @@ namespace { EXPECT_EQ( cds::bitop::MSB(n), 0 ) << "n=" << n; EXPECT_EQ( cds::bitop::LSB( n ), 0 ) << "n=" << n; EXPECT_EQ( cds::bitop::SBC( n ), 0 ) << "n=" << n; - EXPECT_EQ( cds::bitop::ZBC( n ), sizeof( n ) * 8 ) << "n=" << n; + EXPECT_EQ( cds::bitop::ZBC( n ), static_cast( sizeof( n ) * 8 )) << "n=" << n; int nBit = 1; for ( n = 1; n != 0; n *= 2 ) { @@ -83,15 +83,15 @@ namespace { TEST_F( bitop, floor_pow2 ) { - EXPECT_EQ( cds::beans::floor2( 0 ), 1 ); - EXPECT_EQ( cds::beans::floor2( 1 ), 1 ); - EXPECT_EQ( cds::beans::floor2( 2 ), 2 ); - EXPECT_EQ( cds::beans::floor2( 3 ), 2 ); - EXPECT_EQ( cds::beans::floor2( 4 ), 4 ); - EXPECT_EQ( cds::beans::floor2( 5 ), 4 ); - EXPECT_EQ( cds::beans::floor2( 7 ), 4 ); - EXPECT_EQ( cds::beans::floor2( 8 ), 8 ); - EXPECT_EQ( cds::beans::floor2( 9 ), 8 ); + EXPECT_EQ( cds::beans::floor2( 0 ), 1u ); + EXPECT_EQ( cds::beans::floor2( 1 ), 1u ); + EXPECT_EQ( cds::beans::floor2( 2 ), 2u ); + EXPECT_EQ( cds::beans::floor2( 3 ), 2u ); + EXPECT_EQ( cds::beans::floor2( 4 ), 4u ); + EXPECT_EQ( cds::beans::floor2( 5 ), 4u ); + EXPECT_EQ( cds::beans::floor2( 7 ), 4u ); + EXPECT_EQ( cds::beans::floor2( 8 ), 8u ); + EXPECT_EQ( cds::beans::floor2( 9 ), 8u ); for ( uint32_t n = 2; n; n <<= 1 ) { diff --git a/test/unit/misc/cxx11_atomic_class.cpp b/test/unit/misc/cxx11_atomic_class.cpp index 4f3c13e0..3cf53c04 100644 --- a/test/unit/misc/cxx11_atomic_class.cpp +++ b/test/unit/misc/cxx11_atomic_class.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: @@ -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. */ #include @@ -73,15 +73,15 @@ namespace { EXPECT_TRUE( a.is_lock_free() ); a.store( (integral_type) 0 ); - EXPECT_EQ( a, 0 ); - EXPECT_EQ( a.load(), 0 ); + EXPECT_EQ( a, static_cast( 0 )); + EXPECT_EQ( a.load(), static_cast( 0 )); for ( size_t nByte = 0; nByte < sizeof(Integral); ++nByte ) { integral_type n = integral_type(42) << (nByte * 8); - EXPECT_EQ( a.exchange( n ), 0 ); + EXPECT_EQ( a.exchange( n ), static_cast( 0 )); EXPECT_EQ( a, n ); EXPECT_EQ( a.exchange( (integral_type) 0 ), n ); - EXPECT_EQ( a.load(), 0 ); + EXPECT_EQ( a.load(), static_cast( 0 )); } integral_type prev = a.load(); @@ -144,7 +144,7 @@ namespace { EXPECT_EQ( a.fetch_sub(n), prev); } - EXPECT_EQ( a.load(), 0 ); + EXPECT_EQ( a.load(), static_cast( 0 )); // fetch_or / fetc_xor / fetch_and for ( size_t nBit = 0; nBit < sizeof(integral_type) * 8; ++nBit ) @@ -187,7 +187,7 @@ namespace { EXPECT_EQ( (a -= n), prev - n ); } - EXPECT_EQ( a.load(), 0 ); + EXPECT_EQ( a.load(), (integral_type) 0 ); // |= / ^= / &= for ( size_t nBit = 0; nBit < sizeof(integral_type) * 8; ++nBit ) diff --git a/test/unit/misc/cxx11_atomic_func.cpp b/test/unit/misc/cxx11_atomic_func.cpp index e56b8ec7..fe26e56c 100644 --- a/test/unit/misc/cxx11_atomic_func.cpp +++ b/test/unit/misc/cxx11_atomic_func.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: @@ -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. */ #include @@ -88,10 +88,10 @@ namespace misc { for ( size_t nByte = 0; nByte < sizeof(Integral); ++nByte ) { integral_type n = integral_type(42) << (nByte * 8); - EXPECT_EQ( atomics::atomic_exchange( &a, n ), 0 ); + EXPECT_EQ( atomics::atomic_exchange( &a, n ), (integral_type) 0 ); EXPECT_EQ( atomics::atomic_load( &a ), n ); EXPECT_EQ( atomics::atomic_exchange( &a, (integral_type) 0 ), n ); - EXPECT_EQ( atomics::atomic_load( &a ), 0 ); + EXPECT_EQ( atomics::atomic_load( &a ), (integral_type) 0 ); } integral_type prev = atomics::atomic_load( &a ); @@ -155,7 +155,7 @@ namespace misc { EXPECT_EQ( atomics::atomic_fetch_sub( &a, n ), prev ); } - EXPECT_EQ( atomics::atomic_load( &a ), 0 ); + EXPECT_EQ( atomics::atomic_load( &a ), (integral_type) 0 ); // fetch_or / fetc_xor / fetch_and for ( size_t nBit = 0; nBit < sizeof(integral_type) * 8; ++nBit ) @@ -189,14 +189,14 @@ namespace misc { EXPECT_TRUE( atomics::atomic_is_lock_free( &a ) ); atomics::atomic_store_explicit( &a, (integral_type) 0, oStore ); EXPECT_EQ( a, 0 ); - EXPECT_EQ( atomics::atomic_load_explicit( &a, oLoad ), 0 ); + EXPECT_EQ( atomics::atomic_load_explicit( &a, oLoad ), (integral_type) 0 ); for ( size_t nByte = 0; nByte < sizeof(Integral); ++nByte ) { integral_type n = integral_type(42) << (nByte * 8); - EXPECT_EQ( atomics::atomic_exchange_explicit( &a, n, order ), 0 ); + EXPECT_EQ( atomics::atomic_exchange_explicit( &a, n, order ), (integral_type) 0 ); EXPECT_EQ( atomics::atomic_load_explicit( &a, oLoad ), n ); EXPECT_EQ( atomics::atomic_exchange_explicit( &a, (integral_type) 0, order ), n ); - EXPECT_EQ( atomics::atomic_load_explicit( &a, oLoad ), 0 ); + EXPECT_EQ( atomics::atomic_load_explicit( &a, oLoad ), (integral_type) 0 ); } integral_type prev = atomics::atomic_load_explicit( &a, oLoad ); diff --git a/test/unit/misc/permutation_generator.cpp b/test/unit/misc/permutation_generator.cpp index f02bb9b2..6a59cb99 100644 --- a/test/unit/misc/permutation_generator.cpp +++ b/test/unit/misc/permutation_generator.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: @@ -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. */ #include @@ -52,9 +52,9 @@ namespace { } while ( gen.next() ); for ( size_t i = 0; i < nLen; ++i ) - EXPECT_EQ( arr[i], 1 ) << "i=" << i; + EXPECT_EQ( arr[i], 1u ) << "i=" << i; for ( size_t i = nLen; i < c_nMax; ++i ) - EXPECT_EQ( arr[i], 0 ) << "i=" << i; + EXPECT_EQ( arr[i], 0u ) << "i=" << i; gen.reset(); } diff --git a/test/unit/pqueue/mspqueue.cpp b/test/unit/pqueue/mspqueue.cpp index 88ce0373..2f22c791 100644 --- a/test/unit/pqueue/mspqueue.cpp +++ b/test/unit/pqueue/mspqueue.cpp @@ -59,8 +59,8 @@ namespace { value_type * pLast = pFirst + pq.capacity(); ASSERT_TRUE( pq.empty() ); - ASSERT_EQ( pq.size(), 0 ); - ASSERT_EQ( pq.capacity(), base_class::c_nCapacity - 1 ); + ASSERT_EQ( pq.size(), 0u ); + ASSERT_EQ( pq.capacity(), size_t( base_class::c_nCapacity - 1 )); size_t nSize = 0; @@ -122,14 +122,14 @@ namespace { ASSERT_TRUE( !pq.full() ); ASSERT_TRUE( !pq.empty() ); - ASSERT_EQ( pq.size(), 1 ); + ASSERT_EQ( pq.size(), 1u ); ASSERT_TRUE( pq.pop( kv ) ); EXPECT_EQ( kv.k, base_class::c_nMinValue ); ASSERT_TRUE( !pq.full() ); ASSERT_TRUE( pq.empty() ); - ASSERT_EQ( pq.size(), 0 ); + ASSERT_EQ( pq.size(), 0u ); // Clear test for ( value_type * p = pFirst; p < pLast; ++p ) { @@ -141,7 +141,7 @@ namespace { pq.clear(); ASSERT_TRUE( pq.empty() ); ASSERT_TRUE( !pq.full() ); - ASSERT_EQ( pq.size(), 0 ); + ASSERT_EQ( pq.size(), 0u ); // clear_with test for ( value_type * p = pFirst; p < pLast; ++p ) { @@ -156,7 +156,7 @@ namespace { pq.clear_with( std::ref( disp ) ); ASSERT_TRUE( pq.empty() ); ASSERT_TRUE( !pq.full() ); - ASSERT_EQ( pq.size(), 0 ); + ASSERT_EQ( pq.size(), 0u ); ASSERT_EQ( disp.m_nCallCount, pq.capacity() ); } } diff --git a/test/unit/pqueue/test_fcpqueue.h b/test/unit/pqueue/test_fcpqueue.h index 9943a7aa..404608ed 100644 --- a/test/unit/pqueue/test_fcpqueue.h +++ b/test/unit/pqueue/test_fcpqueue.h @@ -57,7 +57,7 @@ namespace cds_test { ASSERT_EQ( pq.size(), ++nSize ); } - ASSERT_EQ( pq.size(), PQueueTest::c_nCapacity ); + ASSERT_EQ( pq.size(), static_cast(PQueueTest::c_nCapacity )); // Pop test key_type nPrev = PQueueTest::c_nMinValue + key_type( PQueueTest::c_nCapacity ) - 1; @@ -66,7 +66,7 @@ namespace cds_test { ASSERT_TRUE( pq.pop( kv ) ); EXPECT_EQ( kv.k, nPrev ); - ASSERT_EQ( pq.size(), PQueueTest::c_nCapacity - 1 ); + ASSERT_EQ( pq.size(), static_cast( PQueueTest::c_nCapacity - 1 )); ASSERT_TRUE( !pq.empty() ); nSize = pq.size(); @@ -98,7 +98,7 @@ namespace cds_test { ASSERT_TRUE( pq.push( *p ) ); ASSERT_TRUE( !pq.empty() ); - ASSERT_EQ( pq.size(), PQueueTest::c_nCapacity ); + ASSERT_EQ( pq.size(), static_cast( PQueueTest::c_nCapacity )); pq.clear(); ASSERT_TRUE( pq.empty() ); diff --git a/test/unit/queue/fcqueue.cpp b/test/unit/queue/fcqueue.cpp index 99f7b0c3..c729edf2 100644 --- a/test/unit/queue/fcqueue.cpp +++ b/test/unit/queue/fcqueue.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: @@ -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. */ #include @@ -47,7 +47,7 @@ namespace { const size_t nSize = 100; ASSERT_TRUE( q.empty() ); - ASSERT_EQ( q.size(), 0 ); + ASSERT_EQ( q.size(), 0u ); // enqueue/dequeue for ( size_t i = 0; i < nSize; ++i ) { @@ -64,7 +64,7 @@ namespace { ASSERT_EQ( q.size(), nSize - i - 1 ); } ASSERT_TRUE( q.empty() ); - ASSERT_EQ( q.size(), 0 ); + ASSERT_EQ( q.size(), 0u ); // push/pop for ( size_t i = 0; i < nSize; ++i ) { @@ -81,7 +81,7 @@ namespace { ASSERT_EQ( q.size(), nSize - i - 1 ); } ASSERT_TRUE( q.empty() ); - ASSERT_EQ( q.size(), 0 ); + ASSERT_EQ( q.size(), 0u ); // clear for ( size_t i = 0; i < nSize; ++i ) { @@ -92,19 +92,19 @@ namespace { q.clear(); ASSERT_TRUE( q.empty() ); - ASSERT_EQ( q.size(), 0 ); + ASSERT_EQ( q.size(), 0u ); // pop from empty queue it = nSize * 2; ASSERT_FALSE( q.pop( it )); ASSERT_EQ( it, nSize * 2 ); ASSERT_TRUE( q.empty() ); - ASSERT_EQ( q.size(), 0 ); + ASSERT_EQ( q.size(), 0u ); ASSERT_FALSE( q.dequeue( it ) ); ASSERT_EQ( it, nSize * 2 ); ASSERT_TRUE( q.empty() ); - ASSERT_EQ( q.size(), 0 ); + ASSERT_EQ( q.size(), 0u ); } template @@ -134,7 +134,7 @@ namespace { ASSERT_EQ( s, str[i] ); } ASSERT_TRUE( q.empty() ); - ASSERT_EQ( q.size(), 0 ); + ASSERT_EQ( q.size(), 0u ); } }; diff --git a/test/unit/queue/test_generic_queue.h b/test/unit/queue/test_generic_queue.h index 5efc72cb..9cc7c9f9 100644 --- a/test/unit/queue/test_generic_queue.h +++ b/test/unit/queue/test_generic_queue.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 CDSUNIT_QUEUE_TEST_GENERIC_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( i )); ASSERT_CONTAINER_SIZE( q, nSize - i - 1 ); } ASSERT_TRUE( q.empty() ); diff --git a/test/unit/queue/test_segmented_queue.h b/test/unit/queue/test_segmented_queue.h index 6682bbfa..756b9f20 100644 --- a/test/unit/queue/test_segmented_queue.h +++ b/test/unit/queue/test_segmented_queue.h @@ -152,12 +152,12 @@ namespace cds_test { // pop from empty queue it = nSize * 2; ASSERT_FALSE( q.pop( it ) ); - ASSERT_EQ( it, nSize * 2 ); + ASSERT_EQ( it, static_cast( nSize * 2 )); ASSERT_TRUE( q.empty() ); ASSERT_CONTAINER_SIZE( q, 0 ); ASSERT_FALSE( q.dequeue( it ) ); - ASSERT_EQ( it, nSize * 2 ); + ASSERT_EQ( it, static_cast( nSize * 2 )); ASSERT_TRUE( q.empty() ); ASSERT_CONTAINER_SIZE( q, 0 ); } diff --git a/test/unit/set/test_feldman_hashset_rcu.h b/test/unit/set/test_feldman_hashset_rcu.h index b5afb6af..957d9ff8 100644 --- a/test/unit/set/test_feldman_hashset_rcu.h +++ b/test/unit/set/test_feldman_hashset_rcu.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 CDSUNIT_SET_TEST_FELDMAN_HASHSET_RCU_H @@ -88,7 +88,7 @@ namespace { } for ( auto it = s.cbegin(); it != s.cend(); ++it ) { - EXPECT_EQ( it->nFindCount, it->key() * 3 ); + EXPECT_EQ( it->nFindCount, static_cast( it->key() * 3 )); } for ( auto it = s.rbegin(); it != s.rend(); ++it ) { @@ -96,7 +96,7 @@ namespace { } for ( auto it = s.crbegin(); it != s.crend(); ++it ) { - EXPECT_EQ( it->nFindCount, it->key() * 2 ); + EXPECT_EQ( it->nFindCount, static_cast( it->key() * 2 )); } } diff --git a/test/unit/set/test_set.h b/test/unit/set/test_set.h index fd3957a7..c1b25991 100644 --- a/test/unit/set/test_set.h +++ b/test/unit/set/test_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: @@ -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 CDSUNIT_SET_TEST_SET_H @@ -76,7 +76,7 @@ namespace cds_test { std::pair updResult; std::string str; - updResult = s.update( i.key(), []( bool bNew, value_type&, int ) + updResult = s.update( i.key(), []( bool, value_type&, int ) { ASSERT_TRUE( false ); }, false ); diff --git a/test/unit/stack/fcstack.cpp b/test/unit/stack/fcstack.cpp index 9e612af4..845ec6db 100644 --- a/test/unit/stack/fcstack.cpp +++ b/test/unit/stack/fcstack.cpp @@ -46,46 +46,46 @@ namespace { value_type v; ASSERT_TRUE( stack.empty() ); - ASSERT_EQ( stack.size(), 0 ); + ASSERT_EQ( stack.size(), 0u ); ASSERT_TRUE( stack.push( 1 ) ); ASSERT_TRUE( !stack.empty() ); - ASSERT_EQ( stack.size(), 1 ); + ASSERT_EQ( stack.size(), 1u ); ASSERT_TRUE( stack.push( 2 ) ); ASSERT_TRUE( !stack.empty() ); - ASSERT_EQ( stack.size(), 2 ); + ASSERT_EQ( stack.size(), 2u ); ASSERT_TRUE( stack.push( 3 ) ); ASSERT_TRUE( !stack.empty() ); - ASSERT_EQ( stack.size(), 3 ); + ASSERT_EQ( stack.size(), 3u ); ASSERT_TRUE( stack.pop( v ) ); EXPECT_EQ( v, 3 ); ASSERT_TRUE( !stack.empty() ); - ASSERT_EQ( stack.size(), 2 ); + ASSERT_EQ( stack.size(), 2u ); ASSERT_TRUE( stack.pop( v ) ); EXPECT_EQ( v, 2 ); ASSERT_TRUE( !stack.empty() ); - ASSERT_EQ( stack.size(), 1 ); + ASSERT_EQ( stack.size(), 1u ); ASSERT_TRUE( stack.pop( v ) ); EXPECT_EQ( v, 1 ); ASSERT_TRUE( stack.empty() ); - ASSERT_EQ( stack.size(), 0 ); + ASSERT_EQ( stack.size(), 0u ); v = 1000; ASSERT_TRUE( !stack.pop( v ) ); EXPECT_EQ( v, 1000 ); ASSERT_TRUE( stack.empty() ); - ASSERT_EQ( stack.size(), 0 ); + ASSERT_EQ( stack.size(), 0u ); ASSERT_TRUE( stack.push( 10 ) ); ASSERT_TRUE( stack.push( 20 ) ); ASSERT_TRUE( stack.push( 30 ) ); ASSERT_TRUE( !stack.empty() ); - ASSERT_EQ( stack.size(), 3 ); + ASSERT_EQ( stack.size(), 3u ); while ( stack.pop( v ) ); ASSERT_TRUE( stack.empty() ); - ASSERT_EQ( stack.size(), 0 ); + ASSERT_EQ( stack.size(), 0u ); } }; diff --git a/test/unit/striped-map/test_map.h b/test/unit/striped-map/test_map.h index 4a25dc6f..08dfcdc9 100644 --- a/test/unit/striped-map/test_map.h +++ b/test/unit/striped-map/test_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: @@ -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 CDSUNIT_STRIPED_MAP_TEST_MAP_H @@ -138,7 +138,7 @@ namespace cds_test { v.second.nVal = v.first.nKey; v.second.strVal = std::to_string( v.first.nKey ); } )); - ASSERT_FALSE( m.insert_with( i, []( map_pair& v ) { + ASSERT_FALSE( m.insert_with( i, []( map_pair& ) { EXPECT_TRUE( false ); } )); break; @@ -147,7 +147,7 @@ namespace cds_test { v.second.nVal = v.first.nKey; v.second.strVal = std::to_string( v.first.nKey ); } )); - ASSERT_FALSE( m.insert_with( i.nKey, []( map_pair& v ) { + ASSERT_FALSE( m.insert_with( i.nKey, []( map_pair& ) { EXPECT_TRUE( false ); } )); break; @@ -156,7 +156,7 @@ namespace cds_test { v.second.nVal = v.first.nKey; v.second.strVal = std::to_string( v.first.nKey ); } )); - ASSERT_FALSE( m.insert_with( val.strVal, []( map_pair& v ) { + ASSERT_FALSE( m.insert_with( val.strVal, []( map_pair& ) { EXPECT_TRUE( false ); } )); break; diff --git a/test/unit/striped-map/test_striped_map.h b/test/unit/striped-map/test_striped_map.h index b5ad0c05..4ad0e42b 100644 --- a/test/unit/striped-map/test_striped_map.h +++ b/test/unit/striped-map/test_striped_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: @@ -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 CDSUNIT_STRIPED_MAP_TEST_STRIPED_MAP_H @@ -212,7 +212,7 @@ namespace { v.second.nVal = v.first.nKey; v.second.strVal = std::to_string( v.first.nKey ); } )); - ASSERT_FALSE( m.insert_with( i, []( map_pair& v ) { + ASSERT_FALSE( m.insert_with( i, []( map_pair& ) { EXPECT_TRUE( false ); } )); break; @@ -221,7 +221,7 @@ namespace { v.second.nVal = v.first.nKey; v.second.strVal = std::to_string( v.first.nKey ); } )); - ASSERT_FALSE( m.insert_with( i.nKey, []( map_pair& v ) { + ASSERT_FALSE( m.insert_with( i.nKey, []( map_pair& ) { EXPECT_TRUE( false ); } )); break; @@ -230,7 +230,7 @@ namespace { v.second.nVal = v.first.nKey; v.second.strVal = std::to_string( v.first.nKey ); } )); - ASSERT_FALSE( m.insert_with( val.strVal, []( map_pair& v ) { + ASSERT_FALSE( m.insert_with( val.strVal, []( map_pair& ) { EXPECT_TRUE( false ); } )); break; diff --git a/test/unit/striped-set/test_intrusive_set.h b/test/unit/striped-set/test_intrusive_set.h index 0e6acfab..82f4e386 100644 --- a/test/unit/striped-set/test_intrusive_set.h +++ b/test/unit/striped-set/test_intrusive_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: @@ -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 CDSUNIT_STRIPED_SET_TEST_INTRUSIVE_SET_H @@ -362,7 +362,7 @@ namespace cds_test { std::pair updResult; - updResult = s.update( i, []( bool bNew, value_type&, value_type& ) + updResult = s.update( i, []( bool /*bNew*/, value_type&, value_type& ) { ASSERT_TRUE( false ); }, false ); @@ -382,11 +382,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: @@ -403,11 +403,11 @@ namespace cds_test { ASSERT_TRUE( s.contains( i.nKey ) ); ASSERT_TRUE( s.contains( i ) ); ASSERT_TRUE( s.contains( other_item( i.key() ), other_predicate())); - EXPECT_EQ( i.nFindCount, 0 ); + EXPECT_EQ( i.nFindCount, 0u ); ASSERT_TRUE( s.find( i.nKey, []( value_type& v, int ) { ++v.nFindCount; } )); - EXPECT_EQ( i.nFindCount, 1 ); + EXPECT_EQ( i.nFindCount, 1u ); ASSERT_TRUE( s.find_with( other_item( i.key() ), other_predicate(), []( value_type& v, other_item const& ) { ++v.nFindCount; } )); - EXPECT_EQ( i.nFindCount, 2 ); + EXPECT_EQ( i.nFindCount, 2u ); } ASSERT_FALSE( s.empty() ); ASSERT_CONTAINER_SIZE( s, nSetSize ); @@ -422,11 +422,11 @@ namespace cds_test { ASSERT_TRUE( s.contains( i.nKey ) ); ASSERT_TRUE( s.contains( i ) ); ASSERT_TRUE( s.contains( other_item( i.key() ), other_predicate() ) ); - EXPECT_EQ( i.nFindCount, 0 ); + EXPECT_EQ( i.nFindCount, 0u ); ASSERT_TRUE( s.find( i.nKey, []( value_type& v, int ) { ++v.nFindCount; } ) ); - EXPECT_EQ( i.nFindCount, 1 ); + EXPECT_EQ( i.nFindCount, 1u ); ASSERT_TRUE( s.find_with( other_item( i.key() ), other_predicate(), []( value_type& v, other_item const& ) { ++v.nFindCount; } ) ); - EXPECT_EQ( i.nFindCount, 2 ); + EXPECT_EQ( i.nFindCount, 2u ); value_type v( i ); switch ( i.key() % 6 ) { @@ -448,18 +448,18 @@ namespace cds_test { ASSERT_FALSE( s.erase_with( other_item( i.key() ), other_predicate() ) ); 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_predicate(), []( 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_predicate(), []( value_type& val ) { ++val.nEraseCount; } )); - EXPECT_EQ( i.nEraseCount, 1 ); + EXPECT_EQ( i.nEraseCount, 1u ); break; } diff --git a/test/unit/striped-set/test_intrusive_striped_set.h b/test/unit/striped-set/test_intrusive_striped_set.h index a85ad77d..25ebb145 100644 --- a/test/unit/striped-set/test_intrusive_striped_set.h +++ b/test/unit/striped-set/test_intrusive_striped_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: @@ -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 CDSUNIT_SET_TEST_INTRUSIVE_STRIPED_SET_H diff --git a/test/unit/striped-set/test_set.h b/test/unit/striped-set/test_set.h index 33a7d290..15667e60 100644 --- a/test/unit/striped-set/test_set.h +++ b/test/unit/striped-set/test_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: @@ -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 CDSUNIT_STRIPED_SET_TEST_SET_H @@ -318,7 +318,7 @@ namespace cds_test { std::pair updResult; std::string str; - updResult = s.update( i.key(), []( bool bNew, value_type&, int ) + updResult = s.update( i.key(), []( bool /*bNew*/, value_type&, int ) { ASSERT_TRUE( false ); }, false ); diff --git a/test/unit/striped-set/test_striped_set.h b/test/unit/striped-set/test_striped_set.h index 8ce32dc7..5fb4a043 100644 --- a/test/unit/striped-set/test_striped_set.h +++ b/test/unit/striped-set/test_striped_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: @@ -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 CDSUNIT_SET_TEST_STRIPED_SET_H @@ -163,7 +163,7 @@ namespace { std::pair updResult; std::string str; - updResult = s.update( i.key(), []( bool bNew, value_type&, int ) + updResult = s.update( i.key(), []( bool, value_type&, int ) { ASSERT_TRUE( false ); }, false ); diff --git a/test/unit/tree/test_bronson_avltree_map_ptr.h b/test/unit/tree/test_bronson_avltree_map_ptr.h index 6a302d46..2d3be0a8 100644 --- a/test/unit/tree/test_bronson_avltree_map_ptr.h +++ b/test/unit/tree/test_bronson_avltree_map_ptr.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 CDSUNIT_TREE_TEST_BRONSON_AVLTREE_MAP_PTR_H @@ -269,7 +269,7 @@ namespace { EXPECT_EQ( key.nKey, v.nVal ); EXPECT_EQ( std::to_string( key.nKey ), v.strVal ); })); - ASSERT_FALSE( m.erase_with( other_item( i.nKey ), other_less(), []( key_type const& key, mapped_type& v ) { + ASSERT_FALSE( m.erase_with( other_item( i.nKey ), other_less(), []( key_type const& /*key*/, mapped_type& /*v*/ ) { EXPECT_TRUE( false ); })); break; @@ -294,7 +294,7 @@ namespace { Map::gc::force_dispose(); for ( auto const& item: arrVals ) { - EXPECT_EQ( item.nDisposeCount, 1 ); + EXPECT_EQ( item.nDisposeCount, 1u ); } // clear @@ -313,7 +313,7 @@ namespace { Map::gc::force_dispose(); for ( auto const& item : arrVals ) { - EXPECT_EQ( item.nDisposeCount, 2 ); + EXPECT_EQ( item.nDisposeCount, 2u ); } ASSERT_TRUE( m.check_consistency() ); @@ -361,7 +361,7 @@ namespace { Map::gc::force_dispose(); for ( auto const& item : arrVals ) { - EXPECT_EQ( item.nDisposeCount, 3 ); + EXPECT_EQ( item.nDisposeCount, 3u ); } // extract_min @@ -407,7 +407,7 @@ namespace { Map::gc::force_dispose(); for ( auto const& item : arrVals ) { - EXPECT_EQ( item.nDisposeCount, 4 ); + EXPECT_EQ( item.nDisposeCount, 4u ); } // extract_max @@ -453,7 +453,7 @@ namespace { Map::gc::force_dispose(); for ( auto const& item : arrVals ) { - EXPECT_EQ( item.nDisposeCount, 5 ); + EXPECT_EQ( item.nDisposeCount, 5u ); } // extract min/max on empty map diff --git a/test/unit/tree/test_intrusive_tree.h b/test/unit/tree/test_intrusive_tree.h index 3359e81f..4d568ef8 100644 --- a/test/unit/tree/test_intrusive_tree.h +++ b/test/unit/tree/test_intrusive_tree.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 CDSUNIT_TREE_TEST_INTRUSIVE_TREE_H @@ -309,7 +309,7 @@ namespace cds_test { std::pair updResult; - updResult = t.update( i, []( bool bNew, value_type&, value_type& ) + updResult = t.update( i, []( bool, value_type&, value_type& ) { ASSERT_TRUE( false ); }, false ); @@ -337,7 +337,7 @@ namespace cds_test { i.nUpdateNewCount = 0; break; case 2: - updResult = t.update( i, []( bool bNew, value_type& val, value_type& arg ) + updResult = t.update( i, []( bool, value_type&, value_type& ) { EXPECT_TRUE( false ); }, false ); diff --git a/test/unit/tree/test_tree_map.h b/test/unit/tree/test_tree_map.h index 1733c98b..a6e98156 100644 --- a/test/unit/tree/test_tree_map.h +++ b/test/unit/tree/test_tree_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: @@ -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 CDSUNIT_TREE_TEST_TREE_MAP_H @@ -130,7 +130,7 @@ namespace cds_test { v.second.nVal = v.first.nKey; v.second.strVal = std::to_string( v.first.nKey ); } )); - ASSERT_FALSE( m.insert_with( i, []( map_pair& v ) { + ASSERT_FALSE( m.insert_with( i, []( map_pair& ) { EXPECT_TRUE( false ); } )); break; @@ -139,7 +139,7 @@ namespace cds_test { v.second.nVal = v.first.nKey; v.second.strVal = std::to_string( v.first.nKey ); } )); - ASSERT_FALSE( m.insert_with( i.nKey, []( map_pair& v ) { + ASSERT_FALSE( m.insert_with( i.nKey, []( map_pair& ) { EXPECT_TRUE( false ); } )); break; @@ -148,7 +148,7 @@ namespace cds_test { v.second.nVal = v.first.nKey; v.second.strVal = std::to_string( v.first.nKey ); } )); - ASSERT_FALSE( m.insert_with( val.strVal, []( map_pair& v ) { + ASSERT_FALSE( m.insert_with( val.strVal, []( map_pair& ) { EXPECT_TRUE( false ); } )); break; diff --git a/test/unit/tree/test_tree_set.h b/test/unit/tree/test_tree_set.h index 0c5ce9e4..bb0093c1 100644 --- a/test/unit/tree/test_tree_set.h +++ b/test/unit/tree/test_tree_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: @@ -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 CDSUNIT_SET_TEST_TREE_SET_H @@ -274,7 +274,7 @@ namespace cds_test { std::pair updResult; std::string str; - updResult = s.update( i.key(), []( bool bNew, value_type&, int ) + updResult = s.update( i.key(), []( bool, value_type&, int ) { ASSERT_TRUE( false ); }, false ); @@ -310,7 +310,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: @@ -319,7 +319,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: @@ -344,7 +344,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: @@ -369,7 +369,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: @@ -423,11 +423,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_less(), []( value_type& v, other_item const& ) { - EXPECT_EQ( ++v.nFindCount, 3 ); + EXPECT_EQ( ++v.nFindCount, 3u ); })); int nKey = i.key() - 1; diff --git a/test/unit/tree/test_tree_set_hp.h b/test/unit/tree/test_tree_set_hp.h index b0bed2f5..3ce0c3b4 100644 --- a/test/unit/tree/test_tree_set_hp.h +++ b/test/unit/tree/test_tree_set_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: @@ -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 CDSUNIT_SET_TEST_TREE_SET_HP_H @@ -117,7 +117,7 @@ namespace cds_test { break; } EXPECT_EQ( gp->key(), i.key() ); - EXPECT_EQ( gp->nFindCount, i.key() * 3 ); + EXPECT_EQ( gp->nFindCount, static_cast( i.key() * 3 )); switch ( idx % 3 ) { case 0: -- 2.34.1