From 56cda12279b911a004a2e8c41ab274665a7a8b5f Mon Sep 17 00:00:00 2001
From: Henning Baldersheim <balder@yahoo-inc.com>
Date: Wed, 3 May 2017 16:58:18 +0200
Subject: Revert "Revert "Fix warnings hidden earlier due to including
 application headers as s…""
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../multibitvectoriterator/multibitvectoriterator_bench.cpp        | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'searchlib/src/tests/queryeval/multibitvectoriterator')

diff --git a/searchlib/src/tests/queryeval/multibitvectoriterator/multibitvectoriterator_bench.cpp b/searchlib/src/tests/queryeval/multibitvectoriterator/multibitvectoriterator_bench.cpp
index 4f99f01c290..dc0282c8ae2 100644
--- a/searchlib/src/tests/queryeval/multibitvectoriterator/multibitvectoriterator_bench.cpp
+++ b/searchlib/src/tests/queryeval/multibitvectoriterator/multibitvectoriterator_bench.cpp
@@ -1,7 +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/log/log.h>
-LOG_SETUP("multibitvectoriterator_test");
+
 #include <vespa/vespalib/testkit/testapp.h>
 #include <vespa/searchlib/queryeval/multibitvectoriterator.h>
 #include <vespa/searchlib/queryeval/emptysearch.h>
@@ -10,6 +8,8 @@ LOG_SETUP("multibitvectoriterator_test");
 #include <vespa/searchlib/queryeval/orsearch.h>
 #include <vespa/searchlib/fef/termfieldmatchdata.h>
 #include <vespa/searchlib/fef/termfieldmatchdataarray.h>
+#include <vespa/log/log.h>
+LOG_SETUP("multibitvectoriterator_test");
 
 using namespace search::queryeval;
 using namespace search::fef;
@@ -20,6 +20,7 @@ using namespace search;
 class Test : public vespalib::TestApp
 {
 public:
+    ~Test() {}
     void benchmark();
     int Main() override;
     template <typename T>
-- 
cgit v1.2.3