Revert "Fix warnings hidden earlier due to including application headers as s…"

3 files changed, 14 insertions, 14 deletions

diff --git a/searchlib/src/tests/fef/properties/properties_test.cpp b/searchlib/src/tests/fef/properties/properties_test.cpp
index c7400d5815b..b63cf82a54e 100644
--- a/searchlib/src/tests/fef/properties/properties_test.cpp
+++ b/searchlib/src/tests/fef/properties/properties_test.cpp
@@ -1,4 +1,5 @@
 // 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/vespalib/testkit/test_kit.h>
 #include <vespa/searchlib/fef/indexproperties.h>
 #include <vespa/searchlib/fef/properties.h>
@@ -277,9 +278,9 @@ TEST("test stuff") {
 
         { // vespa.matching.minhitsperthread
             EXPECT_EQUAL(matching::MinHitsPerThread::NAME, vespalib::string("vespa.matching.minhitsperthread"));
-            EXPECT_EQUAL(matching::MinHitsPerThread::DEFAULT_VALUE, 0u);
+            EXPECT_EQUAL(matching::MinHitsPerThread::DEFAULT_VALUE, 0);
             Properties p;
-            EXPECT_EQUAL(matching::MinHitsPerThread::lookup(p), 0u);
+            EXPECT_EQUAL(matching::MinHitsPerThread::lookup(p), 0);
             p.add("vespa.matching.minhitsperthread", "50");
             EXPECT_EQUAL(matching::MinHitsPerThread::lookup(p), 50u);
         }
diff --git a/searchlib/src/tests/fef/resolver/resolver_test.cpp b/searchlib/src/tests/fef/resolver/resolver_test.cpp
index 37a46861931..e7805f123ef 100644
--- a/searchlib/src/tests/fef/resolver/resolver_test.cpp
+++ b/searchlib/src/tests/fef/resolver/resolver_test.cpp
@@ -1,13 +1,12 @@
 // 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("resolver_test");
 #include <vespa/vespalib/testkit/testapp.h>
 #include <vespa/searchlib/fef/fef.h>
 #include <vespa/searchlib/fef/test/indexenvironment.h>
 #include <vespa/searchlib/features/valuefeature.h>
 
-#include <vespa/log/log.h>
-LOG_SETUP("resolver_test");
-
 namespace search {
 namespace fef {
 
@@ -60,7 +59,6 @@ private:
     void requireThatWeGetUniqueBlueprints();
 public:
     Test();
-    ~Test();
     int Main() override;
 };
 
@@ -70,7 +68,6 @@ Test::Test() :
     _factory.addPrototype(Blueprint::SP(new BaseBlueprint()));
     _factory.addPrototype(Blueprint::SP(new CombineBlueprint()));
 }
-Test::~Test() {}
 
 void
 Test::requireThatWeGetUniqueBlueprints()
diff --git a/searchlib/src/tests/fef/table/table_test.cpp b/searchlib/src/tests/fef/table/table_test.cpp
index a28c8e3e70f..a049df231cc 100644
--- a/searchlib/src/tests/fef/table/table_test.cpp
+++ b/searchlib/src/tests/fef/table/table_test.cpp
@@ -1,11 +1,16 @@
 // 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("tablemanager_test");
 #include <vespa/vespalib/testkit/testapp.h>
+
+#include <fstream>
+#include <limits>
+#include <iostream>
 #include <vespa/searchlib/fef/filetablefactory.h>
 #include <vespa/searchlib/fef/functiontablefactory.h>
+#include <vespa/searchlib/fef/table.h>
 #include <vespa/searchlib/fef/tablemanager.h>
-#include <fstream>
-#include <iostream>
 
 namespace search {
 namespace fef {
@@ -24,7 +29,6 @@ private:
     const std::string _tables2Dir;
 public:
     TableTest();
-    ~TableTest();
     int Main() override;
 };
 
@@ -35,8 +39,6 @@ TableTest::TableTest() :
 {
 }
 
-TableTest::~TableTest() {}
-
 bool
 TableTest::assertTable(const Table & act, const Table & exp)
 {