From: khizmax Date: Mon, 26 Sep 2016 19:39:08 +0000 (+0300) Subject: Fixed typo X-Git-Tag: v2.2.0~119 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1999ac759da21bdec88c111379f1065b590e5d63;p=libcds.git Fixed typo --- diff --git a/test/unit/misc/bitop.cpp b/test/unit/misc/bitop.cpp index 487575cd..dfbe8dfa 100644 --- a/test/unit/misc/bitop.cpp +++ b/test/unit/misc/bitop.cpp @@ -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::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 ) { @@ -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::ZBC( n ), sizeof( n ) * 8 - 1 ) << "n=" << n; + EXPECT_EQ( cds::bitop::ZBC( n ), static_cast( sizeof( n ) * 8 - 1 )) << "n=" << n; ++nBit; } diff --git a/test/unit/queue/test_generic_queue.h b/test/unit/queue/test_generic_queue.h index 65203474..d274cdf1 100644 --- a/test/unit/queue/test_generic_queue.h +++ b/test/unit/queue/test_generic_queue.h @@ -107,7 +107,7 @@ namespace cds_test { ASSERT_TRUE( q.pop_with( f )); else ASSERT_TRUE( q.dequeue_with( f )); - ASSERT_EQ( it, i ); + ASSERT_EQ( it, static_cast( i )); 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 ) ); - 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_hp.h b/test/unit/set/test_feldman_hashset_hp.h index d825dc1e..8de0971e 100644 --- a/test/unit/set/test_feldman_hashset_hp.h +++ b/test/unit/set/test_feldman_hashset_hp.h @@ -115,7 +115,7 @@ namespace cds_test { gp = s.extract( i.key() ); ASSERT_FALSE( !gp ); EXPECT_EQ( gp->key(), i.key() ); - EXPECT_EQ( gp->nFindCount, static_cast<>size_t( i.key() * 4 )); + EXPECT_EQ( gp->nFindCount, static_cast( i.key() * 4 )); gp = s.extract( i.key() ); ASSERT_TRUE( !gp );