Merge branch 'dev' of github.com:khizmax/libcds into dev
authorkhizmax <libcds.dev@gmail.com>
Mon, 23 Feb 2015 18:27:58 +0000 (21:27 +0300)
committerkhizmax <libcds.dev@gmail.com>
Mon, 23 Feb 2015 18:27:58 +0000 (21:27 +0300)
1  2 
tests/test-hdr/tree/hdr_bronson_avltree_map.h

index 04f6ac7be27be80eb2891647950fa3947d35655d,9f16c1bea20c3b8c5d661afd6bd35b4323765e7c..f33e56af2f66637e557c399283617c5b84590bb4
@@@ -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<int>(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 );
              CPPUNIT_CHECK( nCount == sizeof(keys) / sizeof(keys[0]));
  
              // extract_min<Func>
-             for ( int i = 0; i < sizeof(keys) / sizeof(keys[0]); ++i )
+             for ( int i = 0; i < static_cast<int>(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; });
              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<int>(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 );
              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<int>(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();
              CPPUNIT_CHECK( nCount == sizeof(keys) / sizeof(keys[0]));
  
              // extract_max<Func>
-             for ( int i = 0; i < sizeof(keys) / sizeof(keys[0]); ++i )
+             for ( int i = 0; i < static_cast<int>(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; });
              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<int>(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 );
              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<int>(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<int>(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 );
              }
  
  
              // extract_with
-             for ( int i = 0; i < sizeof(keys) / sizeof(keys[0]); ++i )
+             for ( int i = 0; i < static_cast<int>(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<int>(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 );
              }