Fixed typo
authorkhizmax <libcds.dev@gmail.com>
Mon, 26 Sep 2016 19:39:08 +0000 (22:39 +0300)
committerkhizmax <libcds.dev@gmail.com>
Mon, 26 Sep 2016 19:39:08 +0000 (22:39 +0300)
test/unit/misc/bitop.cpp
test/unit/queue/test_generic_queue.h
test/unit/set/test_feldman_hashset_hp.h

index 487575cd76191c7f52feffbd3e2fa7aee44e7e36..dfbe8dfaea391733df93724cb775fda2f18f404f 100644 (file)
@@ -66,7 +66,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::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<int>( sizeof( n ) * 8 )) << "n=" << n;
 
         int nBit = 1;
         for ( n = 1; n != 0; n *= 2 ) {
 
         int nBit = 1;
         for ( n = 1; n != 0; n *= 2 ) {
@@ -75,7 +75,7 @@ namespace {
             EXPECT_EQ( cds::bitop::MSBnz( n ), nBit - 1 ) << "n=" << n;
             EXPECT_EQ( cds::bitop::LSBnz( n ), nBit - 1 ) << "n=" << n;
             EXPECT_EQ( cds::bitop::SBC( n ), 1 ) << "n=" << n;
             EXPECT_EQ( cds::bitop::MSBnz( n ), nBit - 1 ) << "n=" << n;
             EXPECT_EQ( cds::bitop::LSBnz( n ), nBit - 1 ) << "n=" << n;
             EXPECT_EQ( cds::bitop::SBC( n ), 1 ) << "n=" << n;
-            EXPECT_EQ( cds::bitop::ZBC( n ), sizeof( n ) * 8 - 1 ) << "n=" << n;
+            EXPECT_EQ( cds::bitop::ZBC( n ), static_cast<int>( sizeof( n ) * 8 - 1 )) << "n=" << n;
 
             ++nBit;
         }
 
             ++nBit;
         }
index 6520347424f7278cd1b565ad3f03eb077dae508a..d274cdf1e70acd38c7eb4a93cba523ec48a4449c 100644 (file)
@@ -107,7 +107,7 @@ namespace cds_test {
                     ASSERT_TRUE( q.pop_with( f ));
                 else
                     ASSERT_TRUE( q.dequeue_with( f ));
                     ASSERT_TRUE( q.pop_with( f ));
                 else
                     ASSERT_TRUE( q.dequeue_with( f ));
-                ASSERT_EQ( it, );
+                ASSERT_EQ( it, static_cast<value_type>( i ));
                 ASSERT_CONTAINER_SIZE( q, nSize - i - 1 );
             }
             ASSERT_TRUE( q.empty() );
                 ASSERT_CONTAINER_SIZE( q, nSize - i - 1 );
             }
             ASSERT_TRUE( q.empty() );
@@ -127,7 +127,7 @@ namespace cds_test {
             // pop from empty queue
             it = nSize * 2;
             ASSERT_FALSE( q.pop( it ) );
             // 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_CONTAINER_SIZE( q, 0 );
 
             ASSERT_TRUE( q.empty() );
             ASSERT_CONTAINER_SIZE( q, 0 );
 
index d825dc1e5a05bc8a4728a4fbd8a56db79f490ce6..8de0971e0da3aa68fd2ef0b64007c35f814a8234 100644 (file)
@@ -115,7 +115,7 @@ namespace cds_test {
                 gp = s.extract( i.key() );
                 ASSERT_FALSE( !gp );
                 EXPECT_EQ( gp->key(), i.key() );
                 gp = s.extract( i.key() );
                 ASSERT_FALSE( !gp );
                 EXPECT_EQ( gp->key(), i.key() );
-                EXPECT_EQ( gp->nFindCount, static_cast<>size_t( i.key() * 4 ));
+                EXPECT_EQ( gp->nFindCount, static_cast<size_t>( i.key() * 4 ));
 
                 gp = s.extract( i.key() );
                 ASSERT_TRUE( !gp );
 
                 gp = s.extract( i.key() );
                 ASSERT_TRUE( !gp );