Fixed minor gcc warnings

diff --git a/test/unit/intrusive-set/test_intrusive_feldman_hashset.h b/test/unit/intrusive-set/test_intrusive_feldman_hashset.h
index d2c9213cd4c11549333d8e77ee2ef6b0c8192177..a87d950321f7be712968dae7d65cdb656adbc077 100644 (file)
--- a/test/unit/intrusive-set/test_intrusive_feldman_hashset.h
+++ b/test/unit/intrusive-set/test_intrusive_feldman_hashset.h
@@ -228,7 +228,7 @@ namespace cds_test {
                 auto& i = data[ idx ];
 
                 ASSERT_TRUE( s.contains( i.nKey ) );
-                EXPECT_EQ( i.nFindCount, 0 );
+                EXPECT_EQ( i.nFindCount, 0u );
                 ASSERT_TRUE( s.find( i.nKey, []( value_type& v ) { ++v.nFindCount; } ) );
                 EXPECT_EQ( i.nFindCount, 1u );
 

diff --git a/test/unit/intrusive-set/test_intrusive_michael_iterable.h b/test/unit/intrusive-set/test_intrusive_michael_iterable.h
index ec6dc1569742ba717b9519884c5b004189a8cb50..a505ad008df5bf4617422d083ca97b8183907a72 100644 (file)
--- a/test/unit/intrusive-set/test_intrusive_michael_iterable.h
+++ b/test/unit/intrusive-set/test_intrusive_michael_iterable.h
@@ -290,11 +290,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 );
                 ASSERT_TRUE( s.find( i.nKey ) != s.end() );
                 ASSERT_TRUE( s.find_with( other_item( i.key() ), other_less() ) != s.end() );
                 EXPECT_EQ( s.find( i.nKey )->nKey, i.key() );
@@ -313,11 +313,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 );
                 ASSERT_TRUE( s.find( i.nKey ) != s.end() );
                 ASSERT_TRUE( s.find_with( other_item( i.key() ), other_less()) != s.end() );
                 EXPECT_EQ( s.find( i.nKey )->nKey, i.key() );
@@ -368,7 +368,7 @@ namespace cds_test {
                 ASSERT_TRUE( s.find_with( other_item( i.key() ), other_less() ) == s.end() );
             }
             ASSERT_TRUE( s.empty() );
-            ASSERT_CONTAINER_SIZE( s, 0 );
+            ASSERT_CONTAINER_SIZE( s, 0u );
 
             // Force retiring cycle
             Set::gc::force_dispose();

diff --git a/test/unit/intrusive-set/test_intrusive_set_hp.h b/test/unit/intrusive-set/test_intrusive_set_hp.h
index 7ae09c73415d9c9b528a93e5d9f6cb29f53f867f..29eb9442cb71fd73101558c7eb0848ee5fc87bbc 100644 (file)
--- a/test/unit/intrusive-set/test_intrusive_set_hp.h
+++ b/test/unit/intrusive-set/test_intrusive_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_INTRUSIVE_SET_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 );
@@ -144,12 +144,12 @@ namespace cds_test {
             gp.release();
 
             ASSERT_TRUE( s.empty() );
-            ASSERT_CONTAINER_SIZE( s, 0 );
+            ASSERT_CONTAINER_SIZE( s, 0u );
 
             // 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/cxx11_atomic_class.cpp b/test/unit/misc/cxx11_atomic_class.cpp
index 54f9ddc1bb6b66f76d95acf46dbb9f48248b0eae..04f7d7f5519e506098c20a1793795230988264d7 100644 (file)
--- a/test/unit/misc/cxx11_atomic_class.cpp
+++ b/test/unit/misc/cxx11_atomic_class.cpp
@@ -308,7 +308,7 @@ namespace {
 
                 EXPECT_EQ( a.fetch_and( (integral_type) ~mask, order ), prev );
                 prev = a.load( oLoad );
-                EXPECT_EQ( ( prev & mask), 0);
+                EXPECT_EQ( ( prev & mask), integral_type( 0 ));
 
                 EXPECT_EQ( a.fetch_xor( mask, order ), prev );
                 prev = a.load( oLoad );

diff --git a/test/unit/misc/cxx11_atomic_func.cpp b/test/unit/misc/cxx11_atomic_func.cpp
index c93e958b4e04ccb35da52a6e2003370a3e64e97f..e7109851465e3084c14129620a3446ee7d7e0246 100644 (file)
--- a/test/unit/misc/cxx11_atomic_func.cpp
+++ b/test/unit/misc/cxx11_atomic_func.cpp
@@ -188,7 +188,7 @@ 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( a, integral_type( 0 ));
             EXPECT_EQ( atomics::atomic_load_explicit( &a, oLoad ), (integral_type) 0 );
 
             for ( size_t nByte = 0; nByte < sizeof(Integral); ++nByte ) {
@@ -275,7 +275,7 @@ namespace misc {
 
                 EXPECT_EQ( atomics::atomic_fetch_and_explicit( &a, (integral_type) ~mask, order ), prev );
                 prev = atomics::atomic_load_explicit( &a, oLoad );
-                EXPECT_EQ( ( prev & mask), 0);
+                EXPECT_EQ( ( prev & mask), integral_type( 0 ));
 
                 EXPECT_EQ( atomics::atomic_fetch_xor_explicit( &a, mask, order ), prev );
                 prev = atomics::atomic_load_explicit( &a, oLoad );

diff --git a/test/unit/misc/split_bitstring.cpp b/test/unit/misc/split_bitstring.cpp
index 2f40bfd77f275140eed961c8425e6a26926bfb74..7aa1a2cd3b0a8c77609f2927f20d355049000332 100644 (file)
--- a/test/unit/misc/split_bitstring.cpp
+++ b/test/unit/misc/split_bitstring.cpp
@@ -134,7 +134,7 @@ namespace {
             ASSERT_EQ( res, src );
             ASSERT_TRUE( splitter.eos() );
             ASSERT_TRUE( !splitter );
-            EXPECT_EQ(splitter.safe_cut(sizeof(src) * 8), 0 );
+            EXPECT_EQ(splitter.safe_cut(sizeof(src) * 8), 0u );
             ASSERT_TRUE( splitter.eos() );
             ASSERT_TRUE( !splitter );
             splitter.reset();
@@ -144,7 +144,7 @@ namespace {
             EXPECT_EQ( res, src );
             ASSERT_TRUE( splitter.eos() );
             ASSERT_TRUE( !splitter );
-            EXPECT_EQ(splitter.safe_cut(sizeof(src) * 8), 0 );
+            EXPECT_EQ(splitter.safe_cut(sizeof(src) * 8), 0u );
             ASSERT_TRUE( splitter.eos() );
             ASSERT_TRUE( !splitter );
 

diff --git a/test/unit/pqueue/intrusive_mspqueue.cpp b/test/unit/pqueue/intrusive_mspqueue.cpp
index 20d7acabe8ffbd5bb03920f85cd2db60ed78d20b..3bed9ddaa65de1a62518da082388f7932e4bccfc 100644 (file)
--- a/test/unit/pqueue/intrusive_mspqueue.cpp
+++ b/test/unit/pqueue/intrusive_mspqueue.cpp
@@ -61,7 +61,7 @@ namespace {
             ASSERT_TRUE( pq.empty() );
             ASSERT_FALSE( pq.full() );
             ASSERT_EQ( pq.size(), 0u );
-            ASSERT_EQ( pq.capacity(), base_class::c_nCapacity - 1 );
+            ASSERT_EQ( pq.capacity(), static_cast<size_t>( base_class::c_nCapacity - 1 ));
 
             size_t nSize = 0;
 

diff --git a/test/unit/queue/fcqueue.cpp b/test/unit/queue/fcqueue.cpp
index c2fb187dacb7773b89c630ab8f2573e4faa4e78c..aa6b67af5213f77db42339d31b82c1541e61fbad 100644 (file)
--- a/test/unit/queue/fcqueue.cpp
+++ b/test/unit/queue/fcqueue.cpp
@@ -97,12 +97,12 @@ namespace {
             // pop from empty queue
             it = nSize * 2;
             ASSERT_FALSE( q.pop( it ));
-            ASSERT_EQ( it, nSize * 2 );
+            ASSERT_EQ( it, static_cast<value_type>( nSize * 2 ));
             ASSERT_TRUE( q.empty() );
             ASSERT_EQ( q.size(), 0u );
 
             ASSERT_FALSE( q.dequeue( it ) );
-            ASSERT_EQ( it, nSize * 2 );
+            ASSERT_EQ( it, static_cast<value_type>( nSize * 2 ));
             ASSERT_TRUE( q.empty() );
             ASSERT_EQ( q.size(), 0u );
         }

diff --git a/test/unit/queue/intrusive_fcqueue.cpp b/test/unit/queue/intrusive_fcqueue.cpp
index aa2db27120bd924a1b2e5e2445e017b7782100c1..a417dae891f998a7236b0b1ebbf498e367a95524 100644 (file)
--- a/test/unit/queue/intrusive_fcqueue.cpp
+++ b/test/unit/queue/intrusive_fcqueue.cpp
@@ -86,18 +86,18 @@ namespace {
                 arr[i].nVal = static_cast<int>(i);
 
             ASSERT_TRUE( q.empty() );
-            ASSERT_EQ( q.size(), 0 );
+            ASSERT_EQ( q.size(), 0u );
 
             // pop from empty queue
             pv = q.pop();
             ASSERT_TRUE( pv == nullptr );
             ASSERT_TRUE( q.empty() );
-            ASSERT_EQ( q.size(), 0 );
+            ASSERT_EQ( q.size(), 0u );
 
             pv = q.dequeue();
             ASSERT_TRUE( pv == nullptr );
             ASSERT_TRUE( q.empty() );
-            ASSERT_EQ( q.size(), 0 );
+            ASSERT_EQ( q.size(), 0u );
 
             // push/pop test
             for ( size_t i = 0; i < nSize; ++i ) {
@@ -120,11 +120,11 @@ namespace {
                 ASSERT_EQ( pv->nVal, static_cast<int>(i) );
             }
             ASSERT_TRUE( q.empty() );
-            ASSERT_EQ( q.size(), 0 );
+            ASSERT_EQ( q.size(), 0u );
 
             // pop() doesn't call disposer
             for ( size_t i = 0; i < nSize; ++i ) {
-                ASSERT_EQ( arr[i].nDisposeCount, 0 );
+                ASSERT_EQ( arr[i].nDisposeCount, 0u );
             }
 
             // clear with disposer
@@ -136,10 +136,10 @@ namespace {
 
             q.clear( true );
             ASSERT_TRUE( q.empty() );
-            ASSERT_EQ( q.size(), 0 );
+            ASSERT_EQ( q.size(), 0u );
 
             for ( size_t i = 0; i < nSize; ++i ) {
-                ASSERT_EQ( arr[i].nDisposeCount, 1 );
+                ASSERT_EQ( arr[i].nDisposeCount, 1u );
             }
 
             // clear without disposer
@@ -148,10 +148,10 @@ namespace {
 
             q.clear();
             ASSERT_TRUE( q.empty() );
-            ASSERT_EQ( q.size(), 0 );
+            ASSERT_EQ( q.size(), 0u );
 
             for ( size_t i = 0; i < nSize; ++i ) {
-                ASSERT_EQ( arr[i].nDisposeCount, 1 );
+                ASSERT_EQ( arr[i].nDisposeCount, 1u );
             }
         }
     };

diff --git a/test/unit/queue/test_bounded_queue.h b/test/unit/queue/test_bounded_queue.h
index 9632c2da2a6d8c8683d3487368abedc306a3c2ba..28f1153a760aaae5c60896ed04022bd0c58f0042 100644 (file)
--- a/test/unit/queue/test_bounded_queue.h
+++ b/test/unit/queue/test_bounded_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/queue/test_intrusive_segmented_queue.h b/test/unit/queue/test_intrusive_segmented_queue.h
index 128dc2609f9614bab7bfa8883a4aae4264f12477..5c1518061f6d33e8af473d90c903e39fbe59503c 100644 (file)
--- a/test/unit/queue/test_intrusive_segmented_queue.h
+++ b/test/unit/queue/test_intrusive_segmented_queue.h
@@ -94,7 +94,7 @@ namespace cds_test {
                 val[i].nValue = static_cast<int>( i );
 
             ASSERT_TRUE( q.empty());
-            ASSERT_CONTAINER_SIZE( q, 0 );
+            ASSERT_CONTAINER_SIZE( q, 0u );
 
             // push/enqueue
             for ( size_t i = 0; i < val.size(); ++i ) {
@@ -130,18 +130,18 @@ namespace cds_test {
             }
             EXPECT_EQ( nCount, val.size());
             EXPECT_TRUE( q.empty() );
-            EXPECT_CONTAINER_SIZE( q, 0 );
+            EXPECT_CONTAINER_SIZE( q, 0u );
 
             // pop from empty queue
             ASSERT_TRUE( q.pop() == nullptr );
             EXPECT_TRUE( q.empty() );
-            EXPECT_CONTAINER_SIZE( q, 0 );
+            EXPECT_CONTAINER_SIZE( q, 0u );
 
             // check that Disposer has not been called
             Queue::gc::force_dispose();
             for ( size_t i = 0; i < val.size(); ++i ) {
-                EXPECT_EQ( val[i].nDisposeCount, 0 );
-                EXPECT_EQ( val[i].nDispose2Count, 0 );
+                EXPECT_EQ( val[i].nDisposeCount, 0u );
+                EXPECT_EQ( val[i].nDispose2Count, 0u );
             }
 
             // clear
@@ -151,14 +151,14 @@ namespace cds_test {
             EXPECT_TRUE( !q.empty() );
 
             q.clear();
-            EXPECT_CONTAINER_SIZE( q, 0 );
+            EXPECT_CONTAINER_SIZE( q, 0u );
             EXPECT_TRUE( q.empty() );
 
             // check if Disposer has been called
             Queue::gc::force_dispose();
             for ( size_t i = 0; i < val.size(); ++i ) {
-                EXPECT_EQ( val[i].nDisposeCount, 1 );
-                EXPECT_EQ( val[i].nDispose2Count, 0 );
+                EXPECT_EQ( val[i].nDisposeCount, 1u );
+                EXPECT_EQ( val[i].nDispose2Count, 0u );
             }
 
             // clear_with
@@ -168,14 +168,14 @@ namespace cds_test {
             EXPECT_TRUE( !q.empty() );
 
             q.clear_with( Disposer2() );
-            EXPECT_CONTAINER_SIZE( q, 0 );
+            EXPECT_CONTAINER_SIZE( q, 0u );
             EXPECT_TRUE( q.empty() );
 
             // check if Disposer has been called
             Queue::gc::force_dispose();
             for ( size_t i = 0; i < val.size(); ++i ) {
-                EXPECT_EQ( val[i].nDisposeCount, 1 );
-                EXPECT_EQ( val[i].nDispose2Count, 1 );
+                EXPECT_EQ( val[i].nDisposeCount, 1u );
+                EXPECT_EQ( val[i].nDispose2Count, 1u );
             }
 
             // check clear on destruct

diff --git a/test/unit/set/test_michael_iterable.h b/test/unit/set/test_michael_iterable.h
index 9742a1cba566357a1938fae7c0434e866c041080..607b277fe21532c21c15046c5e5bc20e2a950d56 100644 (file)
--- a/test/unit/set/test_michael_iterable.h
+++ b/test/unit/set/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:
 

diff --git a/test/unit/set/test_michael_iterable_hp.h b/test/unit/set/test_michael_iterable_hp.h
index 1a8676785266e73e5ec3e9b8fdd20785a90532a5..ca75015eebfebd277765f30dab88c6a7ac62b299 100644 (file)
--- a/test/unit/set/test_michael_iterable_hp.h
+++ b/test/unit/set/test_michael_iterable_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_SET_HP_H
@@ -76,7 +76,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 ));
             }
 
             typedef typename Set::guarded_ptr guarded_ptr;

diff --git a/test/unit/stack/fcstack.cpp b/test/unit/stack/fcstack.cpp
index 845ec6dba9b68bce97a58f0d5f20674c7f9ba349..b82247ef4d7b84f0b32348acfec6cb50fbf4b65f 100644 (file)
--- a/test/unit/stack/fcstack.cpp
+++ b/test/unit/stack/fcstack.cpp
@@ -59,20 +59,20 @@ namespace {
             ASSERT_EQ( stack.size(), 3u );
 
             ASSERT_TRUE( stack.pop( v ) );
-            EXPECT_EQ( v, 3 );
+            EXPECT_EQ( v, value_type( 3 ));
             ASSERT_TRUE( !stack.empty() );
             ASSERT_EQ( stack.size(), 2u );
             ASSERT_TRUE( stack.pop( v ) );
-            EXPECT_EQ( v, 2 );
+            EXPECT_EQ( v, value_type( 2 ));
             ASSERT_TRUE( !stack.empty() );
             ASSERT_EQ( stack.size(), 1u );
             ASSERT_TRUE( stack.pop( v ) );
-            EXPECT_EQ( v, 1 );
+            EXPECT_EQ( v, value_type( 1 ));
             ASSERT_TRUE( stack.empty() );
             ASSERT_EQ( stack.size(), 0u );
             v = 1000;
             ASSERT_TRUE( !stack.pop( v ) );
-            EXPECT_EQ( v, 1000 );
+            EXPECT_EQ( v, value_type( 1000 ));
             ASSERT_TRUE( stack.empty() );
             ASSERT_EQ( stack.size(), 0u );