From: khizmax Date: Mon, 23 Feb 2015 18:27:58 +0000 (+0300) Subject: Merge branch 'dev' of github.com:khizmax/libcds into dev X-Git-Tag: v2.1.0~305^2~51 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=042f5af;p=libcds.git Merge branch 'dev' of github.com:khizmax/libcds into dev --- 042f5af07891d12864632a6e6c14dbd7a044eee2 diff --cc tests/test-hdr/tree/hdr_bronson_avltree_map.h index 04f6ac7b,9f16c1be..f33e56af --- a/tests/test-hdr/tree/hdr_bronson_avltree_map.h +++ b/tests/test-hdr/tree/hdr_bronson_avltree_map.h @@@ -352,9 -342,8 +352,9 @@@ 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 )); + CPPUNIT_CHECK( s.check_consistency( check_functor() )); xp = s.extract_min(); CPPUNIT_ASSERT( xp ); @@@ -370,9 -359,8 +370,9 @@@ 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 )); + CPPUNIT_CHECK( s.check_consistency( check_functor() )); nCount = 1; xp = s.extract_min( [&keyPrev]( key_type k ){ keyPrev = k; }); @@@ -392,9 -380,8 +392,9 @@@ 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 )); + CPPUNIT_CHECK( s.check_consistency( check_functor() )); nCount = 1; xp = s.extract_min_key( keyPrev ); @@@ -414,9 -401,8 +414,9 @@@ 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 )); + CPPUNIT_CHECK( s.check_consistency( check_functor() )); nCount = 1; xp = s.extract_max(); @@@ -434,9 -420,8 +434,9 @@@ 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 )); + CPPUNIT_CHECK( s.check_consistency( check_functor() )); nCount = 1; xp = s.extract_max( [&keyPrev]( key_type k ){ keyPrev = k; }); @@@ -458,9 -443,8 +458,9 @@@ 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 )); + CPPUNIT_CHECK( s.check_consistency( check_functor() )); nCount = 1; xp = s.extract_max_key( keyPrev ); @@@ -482,11 -466,10 +482,11 @@@ 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 )); + CPPUNIT_CHECK( s.check_consistency( check_functor() )); - 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 ); } @@@ -494,11 -477,10 +494,11 @@@ // 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 )); + CPPUNIT_CHECK( s.check_consistency( check_functor() )); - 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 ); }