From: khizmax Date: Tue, 17 Feb 2015 12:58:02 +0000 (+0300) Subject: Fixed comparing signed/unsigned int X-Git-Tag: v2.1.0~305^2~51^2~4 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=720ea7b66870dbe9db90b53cce5f1e73ed86bc95;hp=69b1c69f76b158e808adca18f7d109911ed50fba;p=libcds.git Fixed comparing signed/unsigned int --- diff --git a/tests/test-hdr/tree/hdr_bronson_avltree_map.h b/tests/test-hdr/tree/hdr_bronson_avltree_map.h index 6054555d..9f16c1be 100644 --- a/tests/test-hdr/tree/hdr_bronson_avltree_map.h +++ b/tests/test-hdr/tree/hdr_bronson_avltree_map.h @@ -332,7 +332,7 @@ namespace tree { const int c_nStep = 10; int keys[1000]; - for ( key_type i = 0; i < sizeof(keys) / sizeof(keys[0]); ++i ) + for ( key_type i = 0; i < static_cast(sizeof(keys) / sizeof(keys[0])); ++i ) keys[i] = i; std::random_shuffle( keys, keys + sizeof(keys) / sizeof(keys[0])); @@ -342,7 +342,7 @@ namespace tree { exempt_ptr xp; // extract_min - for ( int i = 0; i < sizeof(keys) / sizeof(keys[0]); ++i ) + for ( int i = 0; i < static_cast(sizeof(keys) / sizeof(keys[0])); ++i ) CPPUNIT_ASSERT( s.emplace( keys[i], keys[i] * c_nStep )); xp = s.extract_min(); @@ -359,7 +359,7 @@ namespace tree { CPPUNIT_CHECK( nCount == sizeof(keys) / sizeof(keys[0])); // extract_min - for ( int i = 0; i < sizeof(keys) / sizeof(keys[0]); ++i ) + for ( int i = 0; i < static_cast(sizeof(keys) / sizeof(keys[0])); ++i ) CPPUNIT_ASSERT( s.insert( keys[i], keys[i] * c_nStep )); nCount = 1; @@ -380,7 +380,7 @@ namespace tree { CPPUNIT_CHECK( nCount == sizeof(keys) / sizeof(keys[0])); // extract_min_key - for ( int i = 0; i < sizeof(keys) / sizeof(keys[0]); ++i ) + for ( int i = 0; i < static_cast(sizeof(keys) / sizeof(keys[0])); ++i ) CPPUNIT_ASSERT( s.insert( keys[i], keys[i] * c_nStep )); nCount = 1; @@ -401,7 +401,7 @@ namespace tree { CPPUNIT_CHECK( nCount == sizeof(keys) / sizeof(keys[0])); // extract_max - for ( int i = 0; i < sizeof(keys) / sizeof(keys[0]); ++i ) + for ( int i = 0; i < static_cast(sizeof(keys) / sizeof(keys[0])); ++i ) CPPUNIT_ASSERT( s.emplace( keys[i], keys[i] * c_nStep )); nCount = 1; @@ -420,7 +420,7 @@ namespace tree { CPPUNIT_CHECK( nCount == sizeof(keys) / sizeof(keys[0])); // extract_max - for ( int i = 0; i < sizeof(keys) / sizeof(keys[0]); ++i ) + for ( int i = 0; i < static_cast(sizeof(keys) / sizeof(keys[0])); ++i ) CPPUNIT_ASSERT( s.emplace( keys[i], keys[i] * c_nStep )); nCount = 1; @@ -443,7 +443,7 @@ namespace tree { CPPUNIT_CHECK( nCount == sizeof(keys) / sizeof(keys[0])); // extract_max_key - for ( int i = 0; i < sizeof(keys) / sizeof(keys[0]); ++i ) + for ( int i = 0; i < static_cast(sizeof(keys) / sizeof(keys[0])); ++i ) CPPUNIT_ASSERT( s.emplace( keys[i], keys[i] * c_nStep )); nCount = 1; @@ -466,10 +466,10 @@ namespace tree { CPPUNIT_CHECK( nCount == sizeof(keys) / sizeof(keys[0])); // extract - for ( int i = 0; i < sizeof(keys) / sizeof(keys[0]); ++i ) + for ( int i = 0; i < static_cast(sizeof(keys) / sizeof(keys[0])); ++i ) CPPUNIT_ASSERT( s.emplace( keys[i], keys[i] * c_nStep )); - for ( int i = 0; i < sizeof( keys ) / sizeof( keys[0] ); ++i ) { + for ( int i = 0; i < static_cast(sizeof( keys ) / sizeof( keys[0] )); ++i ) { xp = s.extract(keys[i]); CPPUNIT_CHECK_EX( xp->nVal == keys[i] * c_nStep, "Expected value=" << keys[i] * c_nStep << " real=" << xp->nVal ); } @@ -477,10 +477,10 @@ namespace tree { // extract_with - for ( int i = 0; i < sizeof(keys) / sizeof(keys[0]); ++i ) + for ( int i = 0; i < static_cast(sizeof(keys) / sizeof(keys[0])); ++i ) CPPUNIT_ASSERT( s.emplace( keys[i], keys[i] * c_nStep )); - for ( int i = 0; i < sizeof( keys ) / sizeof( keys[0] ); ++i ) { + for ( int i = 0; i < static_cast(sizeof( keys ) / sizeof( keys[0] )); ++i ) { xp = s.extract_with( wrapped_int(keys[i]), wrapped_less()); CPPUNIT_CHECK_EX( xp->nVal == keys[i] * c_nStep, "Expected value=" << keys[i] * c_nStep << " real=" << xp->nVal ); }