Ensure that fastos.h is included first

3 files changed, 9 insertions, 9 deletions

diff --git a/searchcore/src/tests/proton/documentdb/storeonlyfeedview/storeonlyfeedview_test.cpp b/searchcore/src/tests/proton/documentdb/storeonlyfeedview/storeonlyfeedview_test.cpp
index fe9251e1193..266fb6279e9 100644
--- a/searchcore/src/tests/proton/documentdb/storeonlyfeedview/storeonlyfeedview_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/storeonlyfeedview/storeonlyfeedview_test.cpp
@@ -1,8 +1,5 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 // Unit tests for storeonlyfeedview.
-
-#include <vespa/log/log.h>
-LOG_SETUP("storeonlyfeedview_test");
 #include <vespa/fastos/fastos.h>
 
 #include <vespa/document/base/documentid.h>
@@ -20,6 +17,9 @@ LOG_SETUP("storeonlyfeedview_test");
 #include <vespa/searchlib/common/serialnum.h>
 #include <vespa/vespalib/testkit/testapp.h>
 
+#include <vespa/log/log.h>
+LOG_SETUP("storeonlyfeedview_test");
+
 using document::BucketId;
 using document::DataType;
 using document::Document;
diff --git a/searchcore/src/tests/proton/matching/sessionmanager_test.cpp b/searchcore/src/tests/proton/matching/sessionmanager_test.cpp
index 078a6985fc4..00c1ebeab16 100644
--- a/searchcore/src/tests/proton/matching/sessionmanager_test.cpp
+++ b/searchcore/src/tests/proton/matching/sessionmanager_test.cpp
@@ -1,8 +1,6 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 // Unit tests for sessionmanager.
 
-#include <vespa/log/log.h>
-LOG_SETUP("sessionmanager_test");
 #include <vespa/fastos/fastos.h>
 
 #include <vespa/searchcore/proton/matching/sessionmanager.h>
@@ -13,6 +11,9 @@ LOG_SETUP("sessionmanager_test");
 #include <vespa/vespalib/testkit/testapp.h>
 #include <vespa/vespalib/data/slime/slime.h>
 
+#include <vespa/log/log.h>
+LOG_SETUP("sessionmanager_test");
+
 using vespalib::string;
 using namespace proton;
 using namespace proton::matching;
diff --git a/searchlib/src/tests/predicate/simple_index_test.cpp b/searchlib/src/tests/predicate/simple_index_test.cpp
index 8ba9e6182fb..d9cbd473ebf 100644
--- a/searchlib/src/tests/predicate/simple_index_test.cpp
+++ b/searchlib/src/tests/predicate/simple_index_test.cpp
@@ -1,14 +1,13 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 // Unit tests for simple_index.
-
-#include <vespa/log/log.h>
-LOG_SETUP("simple_index_test");
 #include <vespa/fastos/fastos.h>
-
 #include <vespa/searchlib/predicate/simple_index.hpp>
 #include <vespa/vespalib/testkit/testapp.h>
 #include <vespa/searchlib/attribute/predicate_attribute.h>
 
+#include <vespa/log/log.h>
+LOG_SETUP("simple_index_test");
+
 using namespace search;
 using namespace search::predicate;
 using vespalib::GenerationHolder;