Merge branch 'master' into aressem/vespa-compile-on-centos7

1 files changed, 3 insertions, 4 deletions

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;