Split out the judymultimap template to separate file and instanciate explicit.

10 files changed, 12 insertions, 4 deletions

diff --git a/searchlib/src/tests/aggregator/perdocexpr.cpp b/searchlib/src/tests/aggregator/perdocexpr.cpp
index f49eea0afa7..3679c4abe5f 100644
--- a/searchlib/src/tests/aggregator/perdocexpr.cpp
+++ b/searchlib/src/tests/aggregator/perdocexpr.cpp
@@ -12,6 +12,7 @@
 #include <vespa/vespalib/util/stringfmt.h>
 #include <vespa/searchlib/expression/getdocidnamespacespecificfunctionnode.h>
 #include <cmath>
+#include <iostream>
 
 using namespace search;
 using namespace search::expression;
diff --git a/searchlib/src/tests/attribute/attribute_test.cpp b/searchlib/src/tests/attribute/attribute_test.cpp
index 8708bc83ff3..4d9eb31d88d 100644
--- a/searchlib/src/tests/attribute/attribute_test.cpp
+++ b/searchlib/src/tests/attribute/attribute_test.cpp
@@ -18,6 +18,7 @@
 #include <vespa/vespalib/io/fileutil.h>
 #include <vespa/searchlib/attribute/attributevector.hpp>
 #include <cmath>
+#include <iostream>
 
 #include <vespa/log/log.h>
 LOG_SETUP("attribute_test");
diff --git a/searchlib/src/tests/attribute/benchmark/attributebenchmark.cpp b/searchlib/src/tests/attribute/benchmark/attributebenchmark.cpp
index 15aff05eade..47944548f32 100644
--- a/searchlib/src/tests/attribute/benchmark/attributebenchmark.cpp
+++ b/searchlib/src/tests/attribute/benchmark/attributebenchmark.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.
 #include <vespa/fastos/fastos.h>
-#include "../attributesearcher.h"
-#include "../attributeupdater.h"
-#include "../runnable.h"
 #include <vespa/searchlib/util/randomgenerator.h>
 #include <vespa/searchlib/attribute/attribute.h>
 #include <vespa/searchlib/attribute/attributeguard.h>
@@ -15,6 +12,9 @@
 #include <vespa/vespalib/util/sync.h>
 #include <iostream>
 #include <fstream>
+#include "../attributesearcher.h"
+#include "../attributeupdater.h"
+#include "../runnable.h"
 #include <vespa/log/log.h>
 
 LOG_SETUP("attributebenchmark");
diff --git a/searchlib/src/tests/attribute/postinglistattribute/postinglistattribute_test.cpp b/searchlib/src/tests/attribute/postinglistattribute/postinglistattribute_test.cpp
index 2f407f7e32b..4f186282999 100644
--- a/searchlib/src/tests/attribute/postinglistattribute/postinglistattribute_test.cpp
+++ b/searchlib/src/tests/attribute/postinglistattribute/postinglistattribute_test.cpp
@@ -16,6 +16,7 @@ LOG_SETUP("postinglistattribute_test");
 #include <vespa/searchlib/attribute/enumstore.hpp>
 #include <vespa/searchlib/attribute/attributevector.hpp>
 #include <vespa/vespalib/util/compress.h>
+#include <iostream>
 
 using std::shared_ptr;
 
diff --git a/searchlib/src/tests/fef/phrasesplitter/benchmark.cpp b/searchlib/src/tests/fef/phrasesplitter/benchmark.cpp
index ca90b1de261..f08a0b3a38e 100644
--- a/searchlib/src/tests/fef/phrasesplitter/benchmark.cpp
+++ b/searchlib/src/tests/fef/phrasesplitter/benchmark.cpp
@@ -5,6 +5,7 @@ LOG_SETUP("phrasesplitter_test");
 #include <vespa/vespalib/testkit/testapp.h>
 
 #include <iomanip>
+#include <iostream>
 #include <vespa/searchlib/fef/matchdatalayout.h>
 #include <vespa/searchlib/fef/phrasesplitter.h>
 #include <vespa/searchlib/fef/test/queryenvironment.h>
diff --git a/searchlib/src/tests/grouping/grouping_test.cpp b/searchlib/src/tests/grouping/grouping_test.cpp
index f1a4b293a25..28c0c080826 100644
--- a/searchlib/src/tests/grouping/grouping_test.cpp
+++ b/searchlib/src/tests/grouping/grouping_test.cpp
@@ -13,6 +13,7 @@ LOG_SETUP("grouping_test");
 #include <vespa/searchlib/expression/fixedwidthbucketfunctionnode.h>
 #include <algorithm>
 #include <cmath>
+#include <iostream>
 
 using namespace vespalib;
 using namespace search;
diff --git a/searchlib/src/tests/groupingengine/groupingengine_test.cpp b/searchlib/src/tests/groupingengine/groupingengine_test.cpp
index dbded897b47..96963d6e320 100644
--- a/searchlib/src/tests/groupingengine/groupingengine_test.cpp
+++ b/searchlib/src/tests/groupingengine/groupingengine_test.cpp
@@ -14,6 +14,7 @@ LOG_SETUP("groupingengine_test");
 #include <vespa/searchlib/grouping/groupingengine.h>
 #include <algorithm>
 #include <cmath>
+#include <iostream>
 
 using namespace vespalib;
 using namespace search;
diff --git a/searchlib/src/tests/index/docbuilder/docbuilder_test.cpp b/searchlib/src/tests/index/docbuilder/docbuilder_test.cpp
index 06599834ab5..460037e0736 100644
--- a/searchlib/src/tests/index/docbuilder/docbuilder_test.cpp
+++ b/searchlib/src/tests/index/docbuilder/docbuilder_test.cpp
@@ -18,6 +18,7 @@ LOG_SETUP("docbuilder_test");
 #include <vespa/vespalib/encoding/base64.h>
 #include <vespa/vespalib/testkit/testapp.h>
 #include <vespa/document/repo/fixedtyperepo.h>
+#include <iostream>
 
 using namespace document;
 
diff --git a/searchlib/src/tests/ranksetup/ranksetup_test.cpp b/searchlib/src/tests/ranksetup/ranksetup_test.cpp
index ead2f09766d..158442a9458 100644
--- a/searchlib/src/tests/ranksetup/ranksetup_test.cpp
+++ b/searchlib/src/tests/ranksetup/ranksetup_test.cpp
@@ -40,6 +40,7 @@ LOG_SETUP("ranksetup_test");
 #include <vespa/searchlib/fef/test/plugin/sum.h>
 #include <vespa/searchlib/fef/test/plugin/cfgvalue.h>
 #include <vespa/searchlib/fef/test/dummy_dependency_handler.h>
+#include <iostream>
 
 using namespace search::fef;
 using namespace search::features;
diff --git a/searchlib/src/vespa/searchlib/util/randomgenerator.h b/searchlib/src/vespa/searchlib/util/randomgenerator.h
index 84bab6f03c9..92a7b190e80 100644
--- a/searchlib/src/vespa/searchlib/util/randomgenerator.h
+++ b/searchlib/src/vespa/searchlib/util/randomgenerator.h
@@ -4,7 +4,7 @@
 
 #include <vespa/fastos/fastos.h>
 #include <vespa/searchlib/util/rand48.h>
-#include <string>
+#include <vespa/vespalib/stllike/string.h>
 #include <vector>
 
 namespace search {