projects
/
libcds.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
69b1c69
)
Fixed comparing signed/unsigned int
author
khizmax
<khizmax@gmail.com>
Tue, 17 Feb 2015 12:58:02 +0000
(15:58 +0300)
committer
khizmax
<khizmax@gmail.com>
Tue, 17 Feb 2015 12:58:02 +0000
(15:58 +0300)
tests/test-hdr/tree/hdr_bronson_avltree_map.h
patch
|
blob
|
history
diff --git
a/tests/test-hdr/tree/hdr_bronson_avltree_map.h
b/tests/test-hdr/tree/hdr_bronson_avltree_map.h
index 6054555d0b92e1e0b3e33aea142cabab60527904..9f16c1bea20c3b8c5d661afd6bd35b4323765e7c 100644
(file)
--- 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];
const int c_nStep = 10;
int keys[1000];
- for ( key_type i = 0; i < s
izeof(keys) / sizeof(keys[0]
); ++i )
+ for ( key_type i = 0; i < s
tatic_cast<key_type>(sizeof(keys) / sizeof(keys[0])
); ++i )
keys[i] = i;
std::random_shuffle( keys, keys + sizeof(keys) / sizeof(keys[0]));
keys[i] = i;
std::random_shuffle( keys, keys + sizeof(keys) / sizeof(keys[0]));
@@
-342,7
+342,7
@@
namespace tree {
exempt_ptr xp;
// extract_min
exempt_ptr xp;
// extract_min
- for ( int i = 0; i < s
izeof(keys) / sizeof(keys[0]
); ++i )
+ for ( int i = 0; i < s
tatic_cast<int>(sizeof(keys) / sizeof(keys[0])
); ++i )
CPPUNIT_ASSERT( s.emplace( keys[i], keys[i] * c_nStep ));
xp = s.extract_min();
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<Func>
CPPUNIT_CHECK( nCount == sizeof(keys) / sizeof(keys[0]));
// extract_min<Func>
- for ( int i = 0; i < s
izeof(keys) / sizeof(keys[0]
); ++i )
+ for ( int i = 0; i < s
tatic_cast<int>(sizeof(keys) / sizeof(keys[0])
); ++i )
CPPUNIT_ASSERT( s.insert( keys[i], keys[i] * c_nStep ));
nCount = 1;
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
CPPUNIT_CHECK( nCount == sizeof(keys) / sizeof(keys[0]));
// extract_min_key
- for ( int i = 0; i < s
izeof(keys) / sizeof(keys[0]
); ++i )
+ for ( int i = 0; i < s
tatic_cast<int>(sizeof(keys) / sizeof(keys[0])
); ++i )
CPPUNIT_ASSERT( s.insert( keys[i], keys[i] * c_nStep ));
nCount = 1;
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
CPPUNIT_CHECK( nCount == sizeof(keys) / sizeof(keys[0]));
// extract_max
- for ( int i = 0; i < s
izeof(keys) / sizeof(keys[0]
); ++i )
+ for ( int i = 0; i < s
tatic_cast<int>(sizeof(keys) / sizeof(keys[0])
); ++i )
CPPUNIT_ASSERT( s.emplace( keys[i], keys[i] * c_nStep ));
nCount = 1;
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<Func>
CPPUNIT_CHECK( nCount == sizeof(keys) / sizeof(keys[0]));
// extract_max<Func>
- for ( int i = 0; i < s
izeof(keys) / sizeof(keys[0]
); ++i )
+ for ( int i = 0; i < s
tatic_cast<int>(sizeof(keys) / sizeof(keys[0])
); ++i )
CPPUNIT_ASSERT( s.emplace( keys[i], keys[i] * c_nStep ));
nCount = 1;
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
CPPUNIT_CHECK( nCount == sizeof(keys) / sizeof(keys[0]));
// extract_max_key
- for ( int i = 0; i < s
izeof(keys) / sizeof(keys[0]
); ++i )
+ for ( int i = 0; i < s
tatic_cast<int>(sizeof(keys) / sizeof(keys[0])
); ++i )
CPPUNIT_ASSERT( s.emplace( keys[i], keys[i] * c_nStep ));
nCount = 1;
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
CPPUNIT_CHECK( nCount == sizeof(keys) / sizeof(keys[0]));
// extract
- for ( int i = 0; i < s
izeof(keys) / sizeof(keys[0]
); ++i )
+ for ( int i = 0; i < s
tatic_cast<int>(sizeof(keys) / sizeof(keys[0])
); ++i )
CPPUNIT_ASSERT( s.emplace( keys[i], keys[i] * c_nStep ));
CPPUNIT_ASSERT( s.emplace( keys[i], keys[i] * c_nStep ));
- for ( int i = 0; i < s
izeof( keys ) / sizeof( keys[0]
); ++i ) {
+ for ( int i = 0; i < s
tatic_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 );
}
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
// extract_with
- for ( int i = 0; i < s
izeof(keys) / sizeof(keys[0]
); ++i )
+ for ( int i = 0; i < s
tatic_cast<int>(sizeof(keys) / sizeof(keys[0])
); ++i )
CPPUNIT_ASSERT( s.emplace( keys[i], keys[i] * c_nStep ));
CPPUNIT_ASSERT( s.emplace( keys[i], keys[i] * c_nStep ));
- for ( int i = 0; i < s
izeof( keys ) / sizeof( keys[0]
); ++i ) {
+ for ( int i = 0; i < s
tatic_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 );
}
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 );
}