diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-05-03 13:09:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-03 13:09:47 +0200 |
| commit | 552836ddc04ac1ba6692bc97309a0f58105b4b8a (patch) | |
| tree | a13d69ea9ef3e73dcb0b937043f7e592d9484270 /vespalib/src/tests/stash | |
| parent | 4a43f160ad2036ef0a947a21fcc196b01863454d (diff) | |
Revert "Revert "Fix warnings hidden earlier due to including application headers as s…""
Diffstat (limited to 'vespalib/src/tests/stash')
| -rw-r--r-- | vespalib/src/tests/stash/stash.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/vespalib/src/tests/stash/stash.cpp b/vespalib/src/tests/stash/stash.cpp index 931c612c1d3..3c6fabd8264 100644 --- a/vespalib/src/tests/stash/stash.cpp +++ b/vespalib/src/tests/stash/stash.cpp @@ -365,7 +365,7 @@ TEST("require that arrays can be copied into the stash") { ArrayRef<PairD> pair_array = stash.copy_array<PairD>(ConstArrayRef<PairD>(paird_vector)); ASSERT_EQUAL(pair_array_nodelete.size(), 3u); ASSERT_EQUAL(pair_array.size(), 3u); - for (size_t i = 0; i < 3; ++i) { + for (int i = 0; i < 3; ++i) { ASSERT_EQUAL(pair_array_nodelete[i].a, i + 1); ASSERT_EQUAL(pair_array_nodelete[i].b, i + 1.5); ASSERT_EQUAL(pair_array[i].a, i + 1); @@ -382,11 +382,11 @@ TEST("require that created arrays are destructed (or not) correctly") { EXPECT_EQUAL(sum({chunk_header_size(), array_dtor_hook_size(), 5 * sizeof(Small)}), stash.count_used()); stash.create_array<Small_NoDelete>(7,destruct_nodelete); EXPECT_EQUAL(sum({chunk_header_size(), array_dtor_hook_size(), 5 * sizeof(Small), 7 * sizeof(Small_NoDelete)}), stash.count_used()); - EXPECT_EQUAL(0, destruct); - EXPECT_EQUAL(0, destruct_nodelete); + EXPECT_EQUAL(0u, destruct); + EXPECT_EQUAL(0u, destruct_nodelete); } - EXPECT_EQUAL(5, destruct); - EXPECT_EQUAL(0, destruct_nodelete); + EXPECT_EQUAL(5u, destruct); + EXPECT_EQUAL(0u, destruct_nodelete); } TEST("require that copied arrays are destructed (or not) correctly") { |