diff options
63 files changed, 85 insertions, 47 deletions
diff --git a/config/src/apps/vespa-configproxy-cmd/proxycmd.h b/config/src/apps/vespa-configproxy-cmd/proxycmd.h index ca5b5e6d119..078e00c3244 100644 --- a/config/src/apps/vespa-configproxy-cmd/proxycmd.h +++ b/config/src/apps/vespa-configproxy-cmd/proxycmd.h @@ -3,6 +3,7 @@ #include <vespa/vespalib/stllike/string.h> #include <vector> +#include <memory> class FRT_Target; class FRT_RPCRequest; diff --git a/config/src/vespa/config/common/configresponse.h b/config/src/vespa/config/common/configresponse.h index 10c2af81feb..fa24c17c858 100644 --- a/config/src/vespa/config/common/configresponse.h +++ b/config/src/vespa/config/common/configresponse.h @@ -2,6 +2,7 @@ #pragma once #include <vespa/vespalib/stllike/string.h> +#include <memory> namespace config { diff --git a/config/src/vespa/config/common/misc.h b/config/src/vespa/config/common/misc.h index b58891eda60..0299ef001f1 100644 --- a/config/src/vespa/config/common/misc.h +++ b/config/src/vespa/config/common/misc.h @@ -4,6 +4,7 @@ #include "configkey.h" #include <vespa/vespalib/stllike/string.h> #include <vector> +#include <memory> namespace vespalib { class Slime; diff --git a/config/src/vespa/config/file_acquirer/file_acquirer.h b/config/src/vespa/config/file_acquirer/file_acquirer.h index 844e277cbf9..31c41bd3512 100644 --- a/config/src/vespa/config/file_acquirer/file_acquirer.h +++ b/config/src/vespa/config/file_acquirer/file_acquirer.h @@ -2,6 +2,7 @@ #pragma once #include <vespa/vespalib/stllike/string.h> +#include <memory> class FRT_Supervisor; class FNET_Transport; diff --git a/config/src/vespa/config/frt/frtconnection.h b/config/src/vespa/config/frt/frtconnection.h index 9e6ef688607..a9a5f745ddb 100644 --- a/config/src/vespa/config/frt/frtconnection.h +++ b/config/src/vespa/config/frt/frtconnection.h @@ -4,6 +4,7 @@ #include "connection.h" #include <vespa/config/common/timingvalues.h> #include <atomic> +#include <memory> class FRT_Supervisor; class FRT_Target; diff --git a/config/src/vespa/config/print/configdatabuffer.h b/config/src/vespa/config/print/configdatabuffer.h index c6f244f826a..bb19e5e9604 100644 --- a/config/src/vespa/config/print/configdatabuffer.h +++ b/config/src/vespa/config/print/configdatabuffer.h @@ -2,6 +2,7 @@ #pragma once #include <vespa/vespalib/stllike/string.h> +#include <memory> namespace vespalib { class Slime; diff --git a/config/src/vespa/config/subscription/sourcespec.h b/config/src/vespa/config/subscription/sourcespec.h index 0187049e733..4a04cfec521 100644 --- a/config/src/vespa/config/subscription/sourcespec.h +++ b/config/src/vespa/config/subscription/sourcespec.h @@ -5,6 +5,7 @@ #include <vespa/config/common/compressiontype.h> #include <vespa/vespalib/stllike/string.h> #include <vector> +#include <memory> namespace config { diff --git a/document/src/vespa/document/annotation/spannode.h b/document/src/vespa/document/annotation/spannode.h index 0a5bbdcaab8..75b2e3a4a4f 100644 --- a/document/src/vespa/document/annotation/spannode.h +++ b/document/src/vespa/document/annotation/spannode.h @@ -3,6 +3,7 @@ #pragma once #include <vespa/vespalib/stllike/string.h> +#include <memory> namespace document { struct SpanTreeVisitor; @@ -10,7 +11,7 @@ struct SpanTreeVisitor; struct SpanNode { typedef std::unique_ptr<SpanNode> UP; - virtual ~SpanNode() {} + virtual ~SpanNode() = default; vespalib::string toString() const; virtual void accept(SpanTreeVisitor &visitor) const = 0; diff --git a/document/src/vespa/document/base/idstring.cpp b/document/src/vespa/document/base/idstring.cpp index 930668b2fac..6cdfec3c24a 100644 --- a/document/src/vespa/document/base/idstring.cpp +++ b/document/src/vespa/document/base/idstring.cpp @@ -5,6 +5,7 @@ #include <vespa/document/bucket/bucketid.h> #include <vespa/vespalib/util/md5.h> #include <vespa/vespalib/util/stringfmt.h> +#include <vespa/vespalib/util/optimized.h> #include <cerrno> using vespalib::string; diff --git a/eval/src/vespa/eval/instruction/index_lookup_table.h b/eval/src/vespa/eval/instruction/index_lookup_table.h index ed26b0ba2f3..18bf0358f27 100644 --- a/eval/src/vespa/eval/instruction/index_lookup_table.h +++ b/eval/src/vespa/eval/instruction/index_lookup_table.h @@ -6,6 +6,7 @@ #include <mutex> #include <vector> #include <map> +#include <memory> namespace vespalib::eval { diff --git a/fnet/src/vespa/fnet/packet.h b/fnet/src/vespa/fnet/packet.h index bd0119628c6..cad82eada56 100644 --- a/fnet/src/vespa/fnet/packet.h +++ b/fnet/src/vespa/fnet/packet.h @@ -3,6 +3,7 @@ #pragma once #include <vespa/vespalib/stllike/string.h> +#include <memory> class FNET_DataBuffer; diff --git a/messagebus/src/vespa/messagebus/result.h b/messagebus/src/vespa/messagebus/result.h index dcf6e4964e5..08c0ddd7d4c 100644 --- a/messagebus/src/vespa/messagebus/result.h +++ b/messagebus/src/vespa/messagebus/result.h @@ -3,6 +3,7 @@ #pragma once #include "error.h" +#include <memory> namespace mbus { diff --git a/messagebus/src/vespa/messagebus/routing/ihopdirective.h b/messagebus/src/vespa/messagebus/routing/ihopdirective.h index 0e5729e5d2e..2b0337f7cc9 100644 --- a/messagebus/src/vespa/messagebus/routing/ihopdirective.h +++ b/messagebus/src/vespa/messagebus/routing/ihopdirective.h @@ -2,6 +2,7 @@ #pragma once #include <vespa/messagebus/common.h> +#include <memory> namespace mbus { diff --git a/metrics/src/vespa/metrics/memoryconsumption.h b/metrics/src/vespa/metrics/memoryconsumption.h index 9b2e0ec0254..da76819ef27 100644 --- a/metrics/src/vespa/metrics/memoryconsumption.h +++ b/metrics/src/vespa/metrics/memoryconsumption.h @@ -18,6 +18,7 @@ #pragma once #include <vespa/vespalib/util/printable.h> +#include <memory> namespace metrics { diff --git a/metrics/src/vespa/metrics/metric.h b/metrics/src/vespa/metrics/metric.h index dbbe0f09eb8..f254ec34074 100644 --- a/metrics/src/vespa/metrics/metric.h +++ b/metrics/src/vespa/metrics/metric.h @@ -1,9 +1,10 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once +#include "name_repo.h" #include <vespa/vespalib/util/printable.h> #include <vespa/vespalib/stllike/string.h> -#include "name_repo.h" +#include <memory> namespace metrics { diff --git a/persistence/src/vespa/persistence/spi/bucketexecutor.h b/persistence/src/vespa/persistence/spi/bucketexecutor.h index d1ada30959e..26884dd04ae 100644 --- a/persistence/src/vespa/persistence/spi/bucketexecutor.h +++ b/persistence/src/vespa/persistence/spi/bucketexecutor.h @@ -3,6 +3,7 @@ #pragma once #include "bucket.h" +#include <memory> namespace vespalib { class IDestructorCallback; } diff --git a/persistence/src/vespa/persistence/spi/resource_usage_listener.h b/persistence/src/vespa/persistence/spi/resource_usage_listener.h index d25bc03ed01..9b1e54c7302 100644 --- a/persistence/src/vespa/persistence/spi/resource_usage_listener.h +++ b/persistence/src/vespa/persistence/spi/resource_usage_listener.h @@ -4,6 +4,7 @@ #include "i_resource_usage_listener.h" #include "resource_usage.h" +#include <memory> namespace vespalib { class IDestructorCallback; } diff --git a/persistencetypes/src/persistence/spi/types.h b/persistencetypes/src/persistence/spi/types.h index cd8bb4da933..de6aa304af0 100644 --- a/persistencetypes/src/persistence/spi/types.h +++ b/persistencetypes/src/persistence/spi/types.h @@ -2,8 +2,9 @@ #pragma once -#include <vector> #include <vespa/vespalib/stllike/string.h> +#include <vector> +#include <memory> namespace vespalib { class nbostream; diff --git a/searchcommon/src/vespa/searchcommon/attribute/i_attribute_functor.h b/searchcommon/src/vespa/searchcommon/attribute/i_attribute_functor.h index c802730e6fe..7216d499f25 100644 --- a/searchcommon/src/vespa/searchcommon/attribute/i_attribute_functor.h +++ b/searchcommon/src/vespa/searchcommon/attribute/i_attribute_functor.h @@ -3,6 +3,7 @@ #pragma once #include <vespa/vespalib/stllike/string.h> +#include <memory> namespace search::attribute { 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; diff --git a/searchcorespi/src/vespa/searchcorespi/index/activediskindexes.h b/searchcorespi/src/vespa/searchcorespi/index/activediskindexes.h index c1c0e4e4d88..324ca3d47da 100644 --- a/searchcorespi/src/vespa/searchcorespi/index/activediskindexes.h +++ b/searchcorespi/src/vespa/searchcorespi/index/activediskindexes.h @@ -5,6 +5,7 @@ #include <vespa/vespalib/stllike/string.h> #include <set> #include <mutex> +#include <memory> namespace searchcorespi::index { 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; }; } diff --git a/searchsummary/src/vespa/searchsummary/docsummary/attribute_field_writer.h b/searchsummary/src/vespa/searchsummary/docsummary/attribute_field_writer.h index b6c6bc82325..95f5f5040f7 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/attribute_field_writer.h +++ b/searchsummary/src/vespa/searchsummary/docsummary/attribute_field_writer.h @@ -3,6 +3,7 @@ #pragma once #include <vespa/vespalib/data/memory.h> +#include <memory> namespace search::attribute { class IAttributeVector; } namespace vespalib::slime { struct Cursor; } diff --git a/staging_vespalib/src/tests/singleexecutor/singleexecutor_test.cpp b/staging_vespalib/src/tests/singleexecutor/singleexecutor_test.cpp index 5cc8862fc05..929c6e9d966 100644 --- a/staging_vespalib/src/tests/singleexecutor/singleexecutor_test.cpp +++ b/staging_vespalib/src/tests/singleexecutor/singleexecutor_test.cpp @@ -4,6 +4,7 @@ #include <vespa/vespalib/util/singleexecutor.h> #include <vespa/vespalib/util/lambdatask.h> +#include <vespa/vespalib/util/alloc.h> #include <atomic> using namespace vespalib; diff --git a/staging_vespalib/src/vespa/vespalib/objects/object2slime.h b/staging_vespalib/src/vespa/vespalib/objects/object2slime.h index c52d5025ca2..7cb7f24b4bf 100644 --- a/staging_vespalib/src/vespa/vespalib/objects/object2slime.h +++ b/staging_vespalib/src/vespa/vespalib/objects/object2slime.h @@ -4,6 +4,7 @@ #include "objectvisitor.h" #include <vector> +#include <memory> namespace vespalib { diff --git a/staging_vespalib/src/vespa/vespalib/util/growablebytebuffer.h b/staging_vespalib/src/vespa/vespalib/util/growablebytebuffer.h index afbde04fb9b..9347a742e60 100644 --- a/staging_vespalib/src/vespa/vespalib/util/growablebytebuffer.h +++ b/staging_vespalib/src/vespa/vespalib/util/growablebytebuffer.h @@ -1,7 +1,7 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once -#include <vespa/vespalib/util/memory.h> +#include <vespa/vespalib/util/alloc.h> #include <vespa/vespalib/stllike/string.h> namespace vespalib { diff --git a/staging_vespalib/src/vespa/vespalib/util/jsonwriter.h b/staging_vespalib/src/vespa/vespalib/util/jsonwriter.h index 0e9e3e10bc3..eef8a2c0cd8 100644 --- a/staging_vespalib/src/vespa/vespalib/util/jsonwriter.h +++ b/staging_vespalib/src/vespa/vespalib/util/jsonwriter.h @@ -1,8 +1,9 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once -#include <vector> #include <vespa/vespalib/stllike/string.h> +#include <vector> +#include <memory> namespace vespalib { diff --git a/staging_vespalib/src/vespa/vespalib/util/programoptions.h b/staging_vespalib/src/vespa/vespalib/util/programoptions.h index 654ca50543e..78ba3a955d0 100644 --- a/staging_vespalib/src/vespa/vespalib/util/programoptions.h +++ b/staging_vespalib/src/vespa/vespalib/util/programoptions.h @@ -27,6 +27,7 @@ #include <map> #include <set> #include <vector> +#include <memory> namespace vespalib { diff --git a/staging_vespalib/src/vespa/vespalib/util/singleexecutor.cpp b/staging_vespalib/src/vespa/vespalib/util/singleexecutor.cpp index 96d8f267875..97214c33a07 100644 --- a/staging_vespalib/src/vespa/vespalib/util/singleexecutor.cpp +++ b/staging_vespalib/src/vespa/vespalib/util/singleexecutor.cpp @@ -1,6 +1,7 @@ // Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "singleexecutor.h" +#include <vespa/vespalib/util/alloc.h> #include <cassert> namespace vespalib { diff --git a/storage/src/vespa/storage/distributor/clusterinformation.h b/storage/src/vespa/storage/distributor/clusterinformation.h index 49abb5e8e75..feb88008f7d 100644 --- a/storage/src/vespa/storage/distributor/clusterinformation.h +++ b/storage/src/vespa/storage/distributor/clusterinformation.h @@ -1,37 +1,26 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once -#include <stdint.h> -#include <vector> #include <vespa/document/bucket/bucketid.h> #include <vespa/vespalib/stllike/string.h> +#include <cstdint> +#include <vector> +#include <memory> -namespace storage { - -namespace lib { - -class ClusterStateBundle; - -} +namespace storage::lib { class ClusterStateBundle; } -namespace distributor { +namespace storage::distributor { class ClusterInformation { public: - typedef std::shared_ptr<const ClusterInformation> CSP; - - virtual ~ClusterInformation() {} + using CSP = std::shared_ptr<const ClusterInformation>; + virtual ~ClusterInformation() = default; virtual uint16_t getDistributorIndex() const = 0; - virtual const lib::ClusterStateBundle& getClusterStateBundle() const = 0; - virtual const char* getStorageUpStates() const = 0; - uint16_t getStorageNodeCount() const; }; } -} - diff --git a/storage/src/vespa/storage/persistence/diskthread.h b/storage/src/vespa/storage/persistence/diskthread.h index 114257c38d4..08862c4251a 100644 --- a/storage/src/vespa/storage/persistence/diskthread.h +++ b/storage/src/vespa/storage/persistence/diskthread.h @@ -13,14 +13,12 @@ #pragma once #include <vespa/storageframework/generic/thread/runnable.h> +#include <memory> +namespace storage::framework { class Thread; } namespace storage { -namespace framework { - class Thread; -} - class DiskThread : public framework::Runnable { public: diff --git a/storage/src/vespa/storage/storageserver/rpc/rpc_target_pool.h b/storage/src/vespa/storage/storageserver/rpc/rpc_target_pool.h index 675341e4a1d..01c899c47db 100644 --- a/storage/src/vespa/storage/storageserver/rpc/rpc_target_pool.h +++ b/storage/src/vespa/storage/storageserver/rpc/rpc_target_pool.h @@ -5,6 +5,7 @@ #include <vespa/vespalib/stllike/string.h> #include <cstdint> #include <vector> +#include <memory> namespace storage::rpc { diff --git a/vdslib/src/vespa/vdslib/distribution/group.h b/vdslib/src/vespa/vdslib/distribution/group.h index 3ce7f9c7a7a..63a69301c06 100644 --- a/vdslib/src/vespa/vdslib/distribution/group.h +++ b/vdslib/src/vespa/vdslib/distribution/group.h @@ -16,6 +16,7 @@ #include <vespa/vespalib/util/crc.h> #include <map> #include <vector> +#include <memory> namespace vespalib { class asciistream; } diff --git a/vdslib/src/vespa/vdslib/distribution/idealnodecalculator.h b/vdslib/src/vespa/vdslib/distribution/idealnodecalculator.h index ecb7beed140..a8c41a5b657 100644 --- a/vdslib/src/vespa/vdslib/distribution/idealnodecalculator.h +++ b/vdslib/src/vespa/vdslib/distribution/idealnodecalculator.h @@ -10,6 +10,7 @@ #include <vespa/document/util/printable.h> #include <vespa/vdslib/state/node.h> #include <vector> +#include <memory> namespace storage::lib { diff --git a/vdslib/src/vespa/vdslib/state/cluster_state_bundle.h b/vdslib/src/vespa/vdslib/state/cluster_state_bundle.h index 039dca2f455..e9098018a24 100644 --- a/vdslib/src/vespa/vdslib/state/cluster_state_bundle.h +++ b/vdslib/src/vespa/vdslib/state/cluster_state_bundle.h @@ -7,6 +7,7 @@ #include <optional> #include <string> #include <unordered_map> +#include <memory> namespace storage::lib { diff --git a/vdslib/src/vespa/vdslib/state/nodestate.h b/vdslib/src/vespa/vdslib/state/nodestate.h index a313c35704d..685030e948f 100644 --- a/vdslib/src/vespa/vdslib/state/nodestate.h +++ b/vdslib/src/vespa/vdslib/state/nodestate.h @@ -13,6 +13,7 @@ #include "state.h" #include <vespa/document/bucket/bucketidfactory.h> #include <vespa/vespalib/objects/floatingpointtype.h> +#include <memory> namespace storage::lib { diff --git a/vespalib/src/vespa/vespalib/stllike/string.h b/vespalib/src/vespa/vespalib/stllike/string.h index 9c9efc175e8..73d8a9d7de3 100644 --- a/vespalib/src/vespa/vespalib/stllike/string.h +++ b/vespalib/src/vespa/vespalib/stllike/string.h @@ -5,7 +5,6 @@ #include <cstring> #include <cstdint> #include <cstdlib> -#include <vespa/vespalib/util/alloc.h> #define VESPA_DLL_LOCAL __attribute__ ((visibility("hidden"))) diff --git a/vespalib/src/vespa/vespalib/stllike/string.hpp b/vespalib/src/vespa/vespalib/stllike/string.hpp index f501a22adb4..50d5717871e 100644 --- a/vespalib/src/vespa/vespalib/stllike/string.hpp +++ b/vespalib/src/vespa/vespalib/stllike/string.hpp @@ -1,5 +1,6 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "string.h" +#include <vespa/vespalib/util/alloc.h> #include <cassert> namespace vespalib { diff --git a/vespalib/src/vespa/vespalib/trace/trace.h b/vespalib/src/vespa/vespalib/trace/trace.h index 2f70785d77d..fbeb4f2fda8 100644 --- a/vespalib/src/vespa/vespalib/trace/trace.h +++ b/vespalib/src/vespa/vespalib/trace/trace.h @@ -2,6 +2,7 @@ #pragma once #include "tracenode.h" +#include <memory> namespace vespalib { diff --git a/vespalib/src/vespa/vespalib/util/exceptions.h b/vespalib/src/vespa/vespalib/util/exceptions.h index 560723c645a..0525af31338 100644 --- a/vespalib/src/vespa/vespalib/util/exceptions.h +++ b/vespalib/src/vespa/vespalib/util/exceptions.h @@ -14,6 +14,7 @@ #include "exception.h" #include "stringfmt.h" +#include <memory> namespace vespalib { |