diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-05-03 14:00:59 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-05-03 14:00:59 +0200 |
commit | 40f313056fd479ab2b19132f308de1aa640b669e (patch) | |
tree | f3c02e1d37a849323925d9f42feda2c87bf40871 /searchlib/src/tests/common | |
parent | ae0c8a912c94e2afed7a2d60158d21fedce7a92c (diff) |
Revert "Fix warnings hidden earlier due to including application headers as s…"
Diffstat (limited to 'searchlib/src/tests/common')
-rw-r--r-- | searchlib/src/tests/common/rcuvector/rcuvector_test.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/searchlib/src/tests/common/rcuvector/rcuvector_test.cpp b/searchlib/src/tests/common/rcuvector/rcuvector_test.cpp index 9361b35ada9..cd6ae2c2567 100644 --- a/searchlib/src/tests/common/rcuvector/rcuvector_test.cpp +++ b/searchlib/src/tests/common/rcuvector/rcuvector_test.cpp @@ -1,5 +1,7 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. - +#include <vespa/fastos/fastos.h> +#include <vespa/log/log.h> +LOG_SETUP("rcuvector_test"); #include <vespa/vespalib/testkit/testapp.h> #include <vespa/searchlib/common/rcuvector.h> @@ -276,8 +278,8 @@ TEST_F("require that shrink() does not increase allocated memory", ShrinkFixture TEST_F("require that shrink() can shrink mmap allocation", ShrinkFixture) { f.vec.shrink(2048); - EXPECT_EQUAL(2048u, f.vec.size()); - EXPECT_EQUAL(3072u, f.vec.capacity()); + EXPECT_EQUAL(2048, f.vec.size()); + EXPECT_EQUAL(3072, f.vec.capacity()); TEST_DO(f.assertOldEqualNewBuffer()); TEST_DO(f.assertEmptyHoldList()); } |