split log and bufferedlog

5 files changed, 7 insertions, 15 deletions

diff --git a/searchlib/src/tests/diskindex/pagedict4/pagedict4test.cpp b/searchlib/src/tests/diskindex/pagedict4/pagedict4test.cpp
index a7e2d5738ce..b96b2b4ff05 100644
--- a/searchlib/src/tests/diskindex/pagedict4/pagedict4test.cpp
+++ b/searchlib/src/tests/diskindex/pagedict4/pagedict4test.cpp
@@ -12,6 +12,7 @@
 #include <vespa/searchlib/diskindex/pagedict4randread.h>
 #include <vespa/searchlib/common/tunefileinfo.h>
 #include <vespa/fastos/app.h>
+#include <sstream>
 
 #include <vespa/log/log.h>
 LOG_SETUP("pagedict4test");
diff --git a/searchlib/src/tests/transactionlogstress/translogstress.cpp b/searchlib/src/tests/transactionlogstress/translogstress.cpp
index 3719c5da1c7..b4285da447b 100644
--- a/searchlib/src/tests/transactionlogstress/translogstress.cpp
+++ b/searchlib/src/tests/transactionlogstress/translogstress.cpp
@@ -9,6 +9,7 @@
 #include <vespa/fastos/app.h>
 #include <iostream>
 #include <stdexcept>
+#include <sstream>
 
 #include <vespa/log/log.h>
 LOG_SETUP("translogstress");
diff --git a/searchlib/src/vespa/searchlib/diskindex/fusion.cpp b/searchlib/src/vespa/searchlib/diskindex/fusion.cpp
index 5ebe6bdeefe..ea66a3435d1 100644
--- a/searchlib/src/vespa/searchlib/diskindex/fusion.cpp
+++ b/searchlib/src/vespa/searchlib/diskindex/fusion.cpp
@@ -3,18 +3,14 @@
 
 #include "fusion.h"
 #include "fieldreader.h"
-#include "fieldwriter.h"
 #include "dictionarywordreader.h"
 #include <vespa/vespalib/util/stringfmt.h>
-#include <vespa/searchlib/common/fslimits.h>
 #include <vespa/searchlib/util/filekit.h>
 #include <vespa/searchlib/util/dirtraverse.h>
 #include <vespa/vespalib/io/fileutil.h>
 #include <vespa/searchlib/common/documentsummary.h>
-#include <vespa/searchlib/common/tunefileinfo.h>
-#include <vespa/searchlib/index/postinglistparams.h>
-#include <vespa/searchlib/util/postingpriorityqueue.h>
 #include <vespa/vespalib/util/error.h>
+#include <sstream>
 
 #include <vespa/log/log.h>
 LOG_SETUP(".diskindex.fusion");
diff --git a/searchlib/src/vespa/searchlib/features/nativerankfeature.cpp b/searchlib/src/vespa/searchlib/features/nativerankfeature.cpp
index 92d00e9f907..924318a4a5a 100644
--- a/searchlib/src/vespa/searchlib/features/nativerankfeature.cpp
+++ b/searchlib/src/vespa/searchlib/features/nativerankfeature.cpp
@@ -3,8 +3,8 @@
 #include "nativerankfeature.h"
 #include "valuefeature.h"
 #include "utils.h"
-#include <vespa/searchlib/fef/fieldinfo.h>
 #include <vespa/searchlib/fef/properties.h>
+#include <sstream>
 
 #include <vespa/log/log.h>
 LOG_SETUP(".features.nativerankfeature");
diff --git a/searchlib/src/vespa/searchlib/test/fakedata/fakewordset.cpp b/searchlib/src/vespa/searchlib/test/fakedata/fakewordset.cpp
index 9bf87ecac1a..b3b5f80a4a2 100644
--- a/searchlib/src/vespa/searchlib/test/fakedata/fakewordset.cpp
+++ b/searchlib/src/vespa/searchlib/test/fakedata/fakewordset.cpp
@@ -2,14 +2,12 @@
 
 #include "fakewordset.h"
 #include "fakeword.h"
-#include <vespa/searchlib/index/schemautil.h>
+#include <sstream>
 
 #include <vespa/log/log.h>
 LOG_SETUP(".fakewordset");
 
-namespace search {
-
-namespace fakedata {
+namespace search::fakedata {
 
 using index::PostingListParams;
 using index::SchemaUtil;
@@ -146,7 +144,6 @@ FakeWordSet::getNumWords()
     return ret;
 }
 
-
 void
 FakeWordSet::addDocIdBias(uint32_t docIdBias)
 {
@@ -154,7 +151,4 @@ FakeWordSet::addDocIdBias(uint32_t docIdBias)
         applyDocIdBiasToVector(_words[i], docIdBias);
 }
 
-
-} // namespace fakedata
-
-} // namespace search
+}