string.h does not need alloc.h

14 files changed, 20 insertions, 8 deletions

diff --git a/searchcore/src/vespa/searchcore/proton/attribute/attribute_usage_filter.h b/searchcore/src/vespa/searchcore/proton/attribute/attribute_usage_filter.h
index cb9687e31a1..45035b40864 100644
--- a/searchcore/src/vespa/searchcore/proton/attribute/attribute_usage_filter.h
+++ b/searchcore/src/vespa/searchcore/proton/attribute/attribute_usage_filter.h
@@ -2,11 +2,12 @@
 
 #pragma once
 
-#include <vespa/searchcore/proton/persistenceengine/i_resource_write_filter.h>
 #include "attribute_usage_stats.h"
 #include "attribute_usage_filter_config.h"
+#include <vespa/searchcore/proton/persistenceengine/i_resource_write_filter.h>
 #include <mutex>
 #include <atomic>
+#include <memory>
 
 namespace proton {
 
diff --git a/searchcore/src/vespa/searchcore/proton/attribute/attribute_usage_sampler_context.h b/searchcore/src/vespa/searchcore/proton/attribute/attribute_usage_sampler_context.h
index 6f33ac483c1..994e4fd40f1 100644
--- a/searchcore/src/vespa/searchcore/proton/attribute/attribute_usage_sampler_context.h
+++ b/searchcore/src/vespa/searchcore/proton/attribute/attribute_usage_sampler_context.h
@@ -4,6 +4,7 @@
 
 #include "attribute_usage_stats.h"
 #include <mutex>
+#include <memory>
 
 namespace proton {
 
diff --git a/searchcore/src/vespa/searchcore/proton/attribute/i_attribute_factory.h b/searchcore/src/vespa/searchcore/proton/attribute/i_attribute_factory.h
index b65f830b32c..012ddaae9a5 100644
--- a/searchcore/src/vespa/searchcore/proton/attribute/i_attribute_factory.h
+++ b/searchcore/src/vespa/searchcore/proton/attribute/i_attribute_factory.h
@@ -4,11 +4,10 @@
 
 #include <vespa/searchlib/common/serialnum.h>
 #include <vespa/vespalib/stllike/string.h>
+#include <memory>
 
-namespace search {
-class AttributeVector;
-namespace attribute { class Config; }
-}
+namespace search { class AttributeVector; }
+namespace search::attribute { class Config; }
 
 namespace proton {
 
diff --git a/searchcore/src/vespa/searchcore/proton/common/i_document_type_inspector.h b/searchcore/src/vespa/searchcore/proton/common/i_document_type_inspector.h
index 0af485ff4b9..c9fa2cce834 100644
--- a/searchcore/src/vespa/searchcore/proton/common/i_document_type_inspector.h
+++ b/searchcore/src/vespa/searchcore/proton/common/i_document_type_inspector.h
@@ -3,6 +3,7 @@
 #pragma once
 
 #include <vespa/vespalib/stllike/string.h>
+#include <memory>
 
 namespace proton {
 
@@ -13,7 +14,7 @@ struct IDocumentTypeInspector
 {
     typedef std::shared_ptr<IDocumentTypeInspector> SP;
 
-    virtual ~IDocumentTypeInspector() {}
+    virtual ~IDocumentTypeInspector() =default;
 
     virtual bool hasUnchangedField(const vespalib::string &name) const = 0;
 };
diff --git a/searchcore/src/vespa/searchcore/proton/feedoperation/feedoperation.h b/searchcore/src/vespa/searchcore/proton/feedoperation/feedoperation.h
index 62176eac5a0..cc1f012a1a6 100644
--- a/searchcore/src/vespa/searchcore/proton/feedoperation/feedoperation.h
+++ b/searchcore/src/vespa/searchcore/proton/feedoperation/feedoperation.h
@@ -3,6 +3,7 @@
 
 #include <vespa/searchlib/common/serialnum.h>
 #include <vespa/vespalib/stllike/string.h>
+#include <memory>
 
 namespace document { class DocumentTypeRepo; }
 namespace vespalib { class nbostream; }
diff --git a/searchcore/src/vespa/searchcore/proton/feedoperation/lidvectorcontext.h b/searchcore/src/vespa/searchcore/proton/feedoperation/lidvectorcontext.h
index b307e50da0a..7280c382f68 100644
--- a/searchcore/src/vespa/searchcore/proton/feedoperation/lidvectorcontext.h
+++ b/searchcore/src/vespa/searchcore/proton/feedoperation/lidvectorcontext.h
@@ -3,6 +3,7 @@
 
 #include <vespa/searchlib/query/base.h>
 #include <vector>
+#include <memory>
 
 namespace vespalib { class nbostream; }
 
diff --git a/searchcore/src/vespa/searchcore/proton/matching/ranking_constants.h b/searchcore/src/vespa/searchcore/proton/matching/ranking_constants.h
index 14e9bf1e20e..c479a40b314 100644
--- a/searchcore/src/vespa/searchcore/proton/matching/ranking_constants.h
+++ b/searchcore/src/vespa/searchcore/proton/matching/ranking_constants.h
@@ -5,6 +5,7 @@
 #include <vespa/vespalib/stllike/string.h>
 #include <map>
 #include <vector>
+#include <memory>
 
 namespace proton::matching {
 
diff --git a/searchcore/src/vespa/searchcore/proton/reference/i_document_db_reference.h b/searchcore/src/vespa/searchcore/proton/reference/i_document_db_reference.h
index 03acb3d5bad..06d7c49e5c6 100644
--- a/searchcore/src/vespa/searchcore/proton/reference/i_document_db_reference.h
+++ b/searchcore/src/vespa/searchcore/proton/reference/i_document_db_reference.h
@@ -2,6 +2,7 @@
 #pragma once
 
 #include <vespa/vespalib/stllike/string.h>
+#include <memory>
 
 namespace search::attribute { class ReadableAttributeVector; }
 
@@ -25,7 +26,7 @@ class IDocumentDBReference
 {
 public:
     using SP = std::shared_ptr<IDocumentDBReference>;
-    virtual ~IDocumentDBReference() { }
+    virtual ~IDocumentDBReference() = default;
     virtual std::shared_ptr<search::attribute::ReadableAttributeVector> getAttribute(vespalib::stringref name) = 0;
     virtual std::shared_ptr<const search::IDocumentMetaStoreContext> getDocumentMetaStore() const = 0;
     virtual std::shared_ptr<search::IGidToLidMapperFactory> getGidToLidMapperFactory() = 0;
diff --git a/searchcore/src/vespa/searchcore/proton/reference/i_document_db_reference_registry.h b/searchcore/src/vespa/searchcore/proton/reference/i_document_db_reference_registry.h
index 8ccfecf051f..a4893b2764b 100644
--- a/searchcore/src/vespa/searchcore/proton/reference/i_document_db_reference_registry.h
+++ b/searchcore/src/vespa/searchcore/proton/reference/i_document_db_reference_registry.h
@@ -2,6 +2,7 @@
 #pragma once
 
 #include <vespa/vespalib/stllike/string.h>
+#include <memory>
 
 namespace proton {
 
@@ -13,7 +14,7 @@ class IDocumentDBReference;
 class IDocumentDBReferenceRegistry
 {
 public:
-    virtual ~IDocumentDBReferenceRegistry() { }
+    virtual ~IDocumentDBReferenceRegistry() = default;
 
     /*
      * Get named IDocumentDBReference.  Block while it doesn't exist.
diff --git a/searchcore/src/vespa/searchcore/proton/server/bootstrapconfigmanager.h b/searchcore/src/vespa/searchcore/proton/server/bootstrapconfigmanager.h
index 0b0dd341975..a0897204ebc 100644
--- a/searchcore/src/vespa/searchcore/proton/server/bootstrapconfigmanager.h
+++ b/searchcore/src/vespa/searchcore/proton/server/bootstrapconfigmanager.h
@@ -4,6 +4,7 @@
 
 #include <vespa/config/retriever/configkeyset.h>
 #include <mutex>
+#include <memory>
 
 namespace config { class ConfigSnapshot; };
 namespace proton {
diff --git a/searchcore/src/vespa/searchcore/proton/server/document_db_maintenance_config.h b/searchcore/src/vespa/searchcore/proton/server/document_db_maintenance_config.h
index d1552178180..af8194a4a19 100644
--- a/searchcore/src/vespa/searchcore/proton/server/document_db_maintenance_config.h
+++ b/searchcore/src/vespa/searchcore/proton/server/document_db_maintenance_config.h
@@ -5,6 +5,7 @@
 #include <vespa/searchcore/proton/attribute/attribute_usage_filter_config.h>
 #include <vespa/vespalib/stllike/string.h>
 #include <vespa/vespalib/util/time.h>
+#include <memory>
 
 namespace proton {
 
diff --git a/searchcore/src/vespa/searchcore/proton/server/i_maintenance_job.h b/searchcore/src/vespa/searchcore/proton/server/i_maintenance_job.h
index 34e882c1f01..869dd2dfdb5 100644
--- a/searchcore/src/vespa/searchcore/proton/server/i_maintenance_job.h
+++ b/searchcore/src/vespa/searchcore/proton/server/i_maintenance_job.h
@@ -3,6 +3,7 @@
 
 #include <vespa/vespalib/stllike/string.h>
 #include <vespa/vespalib/util/time.h>
+#include <memory>
 
 namespace proton {
 
diff --git a/searchcore/src/vespa/searchcore/proton/server/ifrozenbuckethandler.h b/searchcore/src/vespa/searchcore/proton/server/ifrozenbuckethandler.h
index 7729b888d4f..bcd671c95b9 100644
--- a/searchcore/src/vespa/searchcore/proton/server/ifrozenbuckethandler.h
+++ b/searchcore/src/vespa/searchcore/proton/server/ifrozenbuckethandler.h
@@ -3,6 +3,7 @@
 #pragma once
 
 #include <vespa/document/bucket/bucketid.h>
+#include <memory>
 
 namespace proton {
 
diff --git a/searchcore/src/vespa/searchcore/proton/server/isummaryadapter.h b/searchcore/src/vespa/searchcore/proton/server/isummaryadapter.h
index 5c4eb75ecaf..9e4ede6204c 100644
--- a/searchcore/src/vespa/searchcore/proton/server/isummaryadapter.h
+++ b/searchcore/src/vespa/searchcore/proton/server/isummaryadapter.h
@@ -3,6 +3,7 @@
 
 #include <vespa/searchlib/query/base.h>
 #include <vespa/searchlib/common/serialnum.h>
+#include <memory>
 
 namespace document {
     class Document;