string.h does not need alloc.h

11 files changed, 17 insertions, 11 deletions

diff --git a/searchlib/src/vespa/searchlib/attribute/attributefactory.h b/searchlib/src/vespa/searchlib/attribute/attributefactory.h
index edcdee4ff0a..b89d4831fd6 100644
--- a/searchlib/src/vespa/searchlib/attribute/attributefactory.h
+++ b/searchlib/src/vespa/searchlib/attribute/attributefactory.h
@@ -3,6 +3,7 @@
 #pragma once
 
 #include <vespa/searchcommon/attribute/config.h>
+#include <memory>
 
 namespace search {
 
diff --git a/searchlib/src/vespa/searchlib/common/featureset.h b/searchlib/src/vespa/searchlib/common/featureset.h
index beb9bd909ee..71f503baded 100644
--- a/searchlib/src/vespa/searchlib/common/featureset.h
+++ b/searchlib/src/vespa/searchlib/common/featureset.h
@@ -7,6 +7,7 @@
 #include <vespa/vespalib/data/memory.h>
 #include <map>
 #include <vector>
+#include <memory>
 
 namespace search {
 
diff --git a/searchlib/src/vespa/searchlib/common/matching_elements.h b/searchlib/src/vespa/searchlib/common/matching_elements.h
index 60fe7167bfd..6de352f5a01 100644
--- a/searchlib/src/vespa/searchlib/common/matching_elements.h
+++ b/searchlib/src/vespa/searchlib/common/matching_elements.h
@@ -1,10 +1,11 @@
 // Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #pragma once
+#include <vespa/vespalib/stllike/string.h>
 #include <utility>
 #include <map>
 #include <vector>
-#include <vespa/vespalib/stllike/string.h>
+#include <memory>
 
 namespace search {
 
diff --git a/searchlib/src/vespa/searchlib/diskindex/extposocc.h b/searchlib/src/vespa/searchlib/diskindex/extposocc.h
index 49852b18ad3..2bfa163e1d4 100644
--- a/searchlib/src/vespa/searchlib/diskindex/extposocc.h
+++ b/searchlib/src/vespa/searchlib/diskindex/extposocc.h
@@ -3,6 +3,7 @@
 #pragma once
 
 #include <vespa/vespalib/stllike/string.h>
+#include <memory>
 
 namespace search { 
     class TuneFileSeqRead;
diff --git a/searchlib/src/vespa/searchlib/engine/trace.h b/searchlib/src/vespa/searchlib/engine/trace.h
index 4076f0a3daa..101e0da2996 100644
--- a/searchlib/src/vespa/searchlib/engine/trace.h
+++ b/searchlib/src/vespa/searchlib/engine/trace.h
@@ -4,6 +4,7 @@
 
 #include <vespa/vespalib/stllike/string.h>
 #include <vespa/vespalib/util/time.h>
+#include <memory>
 
 namespace vespalib { class Slime; }
 namespace vespalib::slime { struct Cursor; }
diff --git a/searchlib/src/vespa/searchlib/features/fieldmatch/metrics.h b/searchlib/src/vespa/searchlib/features/fieldmatch/metrics.h
index a5f0934cd64..1968b77561c 100644
--- a/searchlib/src/vespa/searchlib/features/fieldmatch/metrics.h
+++ b/searchlib/src/vespa/searchlib/features/fieldmatch/metrics.h
@@ -4,6 +4,7 @@
 #include <vespa/searchlib/common/feature.h>
 #include <vespa/vespalib/stllike/string.h>
 #include <vector>
+#include <memory>
 
 namespace search::features::fieldmatch {
 
diff --git a/searchlib/src/vespa/searchlib/fef/feature_type.cpp b/searchlib/src/vespa/searchlib/fef/feature_type.cpp
index faaa787026e..79c6470b645 100644
--- a/searchlib/src/vespa/searchlib/fef/feature_type.cpp
+++ b/searchlib/src/vespa/searchlib/fef/feature_type.cpp
@@ -3,8 +3,7 @@
 #include "feature_type.h"
 #include <cassert>
 
-namespace search {
-namespace fef {
+namespace search::fef {
 
 const FeatureType FeatureType::_number = FeatureType(TYPE_UP());
 
@@ -28,5 +27,4 @@ FeatureType::type() const {
     return *_type;
 }
 
-} // namespace fef
-} // namespace search
+}
diff --git a/searchlib/src/vespa/searchlib/fef/feature_type.h b/searchlib/src/vespa/searchlib/fef/feature_type.h
index 5763df1fe81..1eaa153e95d 100644
--- a/searchlib/src/vespa/searchlib/fef/feature_type.h
+++ b/searchlib/src/vespa/searchlib/fef/feature_type.h
@@ -3,9 +3,9 @@
 #pragma once
 
 #include <vespa/eval/eval/value_type.h>
+#include <memory>
 
-namespace search {
-namespace fef {
+namespace search::fef {
 
 /**
  * The full type of a feature calculated by the ranking framework. The
@@ -33,5 +33,4 @@ public:
     static FeatureType object(const TYPE &type_in);
 };
 
-} // namespace fef
-} // namespace search
+}
diff --git a/searchlib/src/vespa/searchlib/fef/iindexenvironment.h b/searchlib/src/vespa/searchlib/fef/iindexenvironment.h
index 384b81643cc..0cd017d8ffa 100644
--- a/searchlib/src/vespa/searchlib/fef/iindexenvironment.h
+++ b/searchlib/src/vespa/searchlib/fef/iindexenvironment.h
@@ -3,6 +3,7 @@
 #pragma once
 
 #include <vespa/vespalib/stllike/string.h>
+#include <memory>
 
 namespace vespalib::eval { struct ConstantValue; }
 
diff --git a/searchlib/src/vespa/searchlib/query/streaming/querynode.h b/searchlib/src/vespa/searchlib/query/streaming/querynode.h
index 5a306e2049f..1a3f76fea6f 100644
--- a/searchlib/src/vespa/searchlib/query/streaming/querynode.h
+++ b/searchlib/src/vespa/searchlib/query/streaming/querynode.h
@@ -3,6 +3,7 @@
 
 #include "hit.h"
 #include <vespa/vespalib/stllike/string.h>
+#include <memory>
 
 namespace search { class SimpleQueryStackDumpIterator; }
 
diff --git a/searchlib/src/vespa/searchlib/transactionlog/translogclient.h b/searchlib/src/vespa/searchlib/transactionlog/translogclient.h
index c232dfdad69..423492fa760 100644
--- a/searchlib/src/vespa/searchlib/transactionlog/translogclient.h
+++ b/searchlib/src/vespa/searchlib/transactionlog/translogclient.h
@@ -7,6 +7,7 @@
 #include <map>
 #include <vector>
 #include <mutex>
+#include <memory>
 
 class FNET_Transport;
 class FRT_Supervisor;
@@ -58,11 +59,11 @@ private:
     vespalib::string                   _rpcTarget;
     SessionMap                         _sessions;
     //Brute force lock for subscriptions. For multithread safety.
-    std::mutex   _lock;
+    std::mutex                         _lock;
     std::unique_ptr<FastOS_ThreadPool> _threadPool;
     std::unique_ptr<FNET_Transport>    _transport;
     std::unique_ptr<FRT_Supervisor>    _supervisor;
-    FRT_Target     * _target;
+    FRT_Target                       * _target;
 };
 
 }