Fix warnings hidden earlier due to including application headers as system includes

4 files changed, 12 insertions, 12 deletions

diff --git a/eval/src/tests/eval/function/function_test.cpp b/eval/src/tests/eval/function/function_test.cpp
index 773b3e17d2e..964c48b670b 100644
--- a/eval/src/tests/eval/function/function_test.cpp
+++ b/eval/src/tests/eval/function/function_test.cpp
@@ -374,7 +374,7 @@ TEST("require that Call children can be accessed") {
 
 struct MyNodeHandler : public NodeHandler {
     std::vector<nodes::Node_UP> nodes;
-    virtual void handle(nodes::Node_UP node) override {
+    void handle(nodes::Node_UP node) override {
         if (node.get() != nullptr) {
             nodes.push_back(std::move(node));
         }
@@ -657,9 +657,9 @@ struct MySymbolExtractor : SymbolExtractor {
     }
     MySymbolExtractor() : extra(), invoke_count() {}
     explicit MySymbolExtractor(std::initializer_list<char> extra_in) : extra(extra_in), invoke_count() {}
-    virtual void extract_symbol(const char *pos_in, const char *end_in,
-                                const char *&pos_out, vespalib::string &symbol_out)
-        const override
+
+    void extract_symbol(const char *pos_in, const char *end_in,
+                        const char *&pos_out, vespalib::string &symbol_out) const override
     {
         ++invoke_count;
         for (; pos_in < end_in; ++pos_in) {
diff --git a/eval/src/tests/eval/value_cache/value_cache_test.cpp b/eval/src/tests/eval/value_cache/value_cache_test.cpp
index 4a4b8e286e8..c766f3afc73 100644
--- a/eval/src/tests/eval/value_cache/value_cache_test.cpp
+++ b/eval/src/tests/eval/value_cache/value_cache_test.cpp
@@ -29,7 +29,7 @@ TEST_FF("require that values can be created", MyFactory(), ConstantValueCache(f1
     EXPECT_EQUAL(1.0, res->value().as_double());
     EXPECT_EQUAL(2.0, f2.create("2", "type")->value().as_double());
     EXPECT_EQUAL(3.0, f2.create("3", "type")->value().as_double());
-    EXPECT_EQUAL(3, f1.create_cnt);
+    EXPECT_EQUAL(3u, f1.create_cnt);
 }
 
 TEST_FF("require that underlying values can be shared", MyFactory(), ConstantValueCache(f1)) {
@@ -41,7 +41,7 @@ TEST_FF("require that underlying values can be shared", MyFactory(), ConstantVal
     EXPECT_EQUAL(2.0, res2->value().as_double());
     EXPECT_EQUAL(2.0, res2->value().as_double());
     EXPECT_EQUAL(2.0, res2->value().as_double());
-    EXPECT_EQUAL(2, f1.create_cnt);
+    EXPECT_EQUAL(2u, f1.create_cnt);
 }
 
 TEST_FF("require that unused values are evicted", MyFactory(), ConstantValueCache(f1)) {
@@ -49,7 +49,7 @@ TEST_FF("require that unused values are evicted", MyFactory(), ConstantValueCach
     EXPECT_EQUAL(2.0, f2.create("2", "type")->value().as_double());
     EXPECT_EQUAL(2.0, f2.create("2", "type")->value().as_double());
     EXPECT_EQUAL(2.0, f2.create("2", "type")->value().as_double());
-    EXPECT_EQUAL(4, f1.create_cnt);    
+    EXPECT_EQUAL(4u, f1.create_cnt);
 }
 
 TEST_FF("require that type spec is part of cache key", MyFactory(), ConstantValueCache(f1)) {
@@ -61,7 +61,7 @@ TEST_FF("require that type spec is part of cache key", MyFactory(), ConstantValu
     EXPECT_EQUAL(2.0, res2->value().as_double());
     EXPECT_EQUAL(2.0, res2->value().as_double());
     EXPECT_EQUAL(2.0, res2->value().as_double());
-    EXPECT_EQUAL(3, f1.create_cnt);
+    EXPECT_EQUAL(3u, f1.create_cnt);
 }
 
 TEST_MAIN() { TEST_RUN_ALL(); }
diff --git a/eval/src/tests/eval/value_type/value_type_test.cpp b/eval/src/tests/eval/value_type/value_type_test.cpp
index b72b5a3a972..2c3a8ce6152 100644
--- a/eval/src/tests/eval/value_type/value_type_test.cpp
+++ b/eval/src/tests/eval/value_type/value_type_test.cpp
@@ -65,9 +65,9 @@ TEST("require that dimension index can be obtained") {
     EXPECT_EQUAL(ValueType::double_type().dimension_index("x"), ValueType::Dimension::npos);
     EXPECT_EQUAL(ValueType::tensor_type({}).dimension_index("x"), ValueType::Dimension::npos);
     auto my_type = ValueType::tensor_type({{"y", 10}, {"x"}, {"z", 0}});
-    EXPECT_EQUAL(my_type.dimension_index("x"), 0);
-    EXPECT_EQUAL(my_type.dimension_index("y"), 1);
-    EXPECT_EQUAL(my_type.dimension_index("z"), 2);
+    EXPECT_EQUAL(my_type.dimension_index("x"), 0u);
+    EXPECT_EQUAL(my_type.dimension_index("y"), 1u);
+    EXPECT_EQUAL(my_type.dimension_index("z"), 2u);
     EXPECT_EQUAL(my_type.dimension_index("w"), ValueType::Dimension::npos);
 }
 
diff --git a/eval/src/tests/tensor/tensor_serialization/tensor_serialization_test.cpp b/eval/src/tests/tensor/tensor_serialization/tensor_serialization_test.cpp
index b072b8ec3f8..b27221f6ba5 100644
--- a/eval/src/tests/tensor/tensor_serialization/tensor_serialization_test.cpp
+++ b/eval/src/tests/tensor/tensor_serialization/tensor_serialization_test.cpp
@@ -82,7 +82,7 @@ struct Fixture
         BuilderType builder;
         nbostream wrapStream(stream.peek(), stream.size());
         auto formatId = wrapStream.getInt1_4Bytes();
-        ASSERT_EQUAL(formatId, 1); // sparse format
+        ASSERT_EQUAL(formatId, 1u); // sparse format
         SparseBinaryFormat::deserialize(wrapStream, builder);
         EXPECT_TRUE(wrapStream.size() == 0);
         auto ret = builder.build();