diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-05-02 14:41:49 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2017-05-02 14:41:49 +0200 |
commit | dcd1fb5b8b773b6707046846942ce519959ada7b (patch) | |
tree | deb8d3f917de74bf67bfb0e790ad8056b2f7139c /config | |
parent | 0f646f10b377b90fc37e9911f9fe383d112ff157 (diff) |
Fix warnings hidden earlier due to including application headers as system includes
Diffstat (limited to 'config')
14 files changed, 32 insertions, 13 deletions
diff --git a/config/src/vespa/config/common/configholder.cpp b/config/src/vespa/config/common/configholder.cpp index 1b0d1e0d16b..3ada8797cae 100644 --- a/config/src/vespa/config/common/configholder.cpp +++ b/config/src/vespa/config/common/configholder.cpp @@ -10,6 +10,8 @@ ConfigHolder::ConfigHolder() { } +ConfigHolder::~ConfigHolder() {} + ConfigUpdate::UP ConfigHolder::provide() { diff --git a/config/src/vespa/config/common/configholder.h b/config/src/vespa/config/common/configholder.h index 70330740d45..eb6c485018c 100644 --- a/config/src/vespa/config/common/configholder.h +++ b/config/src/vespa/config/common/configholder.h @@ -13,6 +13,7 @@ class ConfigHolder : public IConfigHolder { public: ConfigHolder(); + ~ConfigHolder(); ConfigUpdate::UP provide() override; void handle(ConfigUpdate::UP update) override; diff --git a/config/src/vespa/config/common/configkey.cpp b/config/src/vespa/config/common/configkey.cpp index fa99dddf12e..36ccb4cb358 100644 --- a/config/src/vespa/config/common/configkey.cpp +++ b/config/src/vespa/config/common/configkey.cpp @@ -39,6 +39,9 @@ ConfigKey::ConfigKey() _key() {} +ConfigKey::ConfigKey(const ConfigKey &) = default; +ConfigKey & ConfigKey::operator = (const ConfigKey &) = default; + ConfigKey::~ConfigKey() { } bool diff --git a/config/src/vespa/config/common/configkey.h b/config/src/vespa/config/common/configkey.h index 9f22c154757..72beb3671a9 100644 --- a/config/src/vespa/config/common/configkey.h +++ b/config/src/vespa/config/common/configkey.h @@ -19,6 +19,10 @@ public: const vespalib::stringref & defMd5, const std::vector<vespalib::string> & defSchema); + ConfigKey(const ConfigKey &); + ConfigKey & operator = (const ConfigKey &); + ConfigKey(ConfigKey &&) = default; + ConfigKey & operator = (ConfigKey &&) = default; ConfigKey(); ~ConfigKey(); @@ -52,4 +56,3 @@ private: }; } //namespace config - diff --git a/config/src/vespa/config/frt/frtconfigagent.cpp b/config/src/vespa/config/frt/frtconfigagent.cpp index ca95e9500db..d69b7219243 100644 --- a/config/src/vespa/config/frt/frtconfigagent.cpp +++ b/config/src/vespa/config/frt/frtconfigagent.cpp @@ -1,8 +1,6 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "frtconfigagent.h" #include <vespa/config/common/trace.h> -#include <vespa/config/common/configrequest.h> -#include <vespa/config/common/configkey.h> #include <vespa/log/log.h> LOG_SETUP(".config.frt.frtconfigagent"); @@ -21,6 +19,8 @@ FRTConfigAgent::FRTConfigAgent(const IConfigHolder::SP & holder, const TimingVal { } +FRTConfigAgent::~FRTConfigAgent() {} + void FRTConfigAgent::handleResponse(const ConfigRequest & request, ConfigResponse::UP response) { diff --git a/config/src/vespa/config/frt/frtconfigagent.h b/config/src/vespa/config/frt/frtconfigagent.h index d8a2e750cc6..989406986d8 100644 --- a/config/src/vespa/config/frt/frtconfigagent.h +++ b/config/src/vespa/config/frt/frtconfigagent.h @@ -26,6 +26,7 @@ class FRTConfigAgent : public ConfigAgent { public: FRTConfigAgent(const IConfigHolder::SP & holder, const TimingValues & timingValues); + ~FRTConfigAgent(); void handleResponse(const ConfigRequest & request, ConfigResponse::UP response) override; uint64_t getTimeout() const override; uint64_t getWaitTime() const override; diff --git a/config/src/vespa/config/frt/frtconfigresponse.cpp b/config/src/vespa/config/frt/frtconfigresponse.cpp index 1aa55dc9ce3..b04eb88261a 100644 --- a/config/src/vespa/config/frt/frtconfigresponse.cpp +++ b/config/src/vespa/config/frt/frtconfigresponse.cpp @@ -1,8 +1,7 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. + #include "frtconfigresponse.h" -#include <vespa/config/common/misc.h> #include <vespa/fnet/frt/frt.h> -#include <vespa/vespalib/stllike/string.h> namespace config { @@ -55,6 +54,8 @@ FRTConfigResponseV1::FRTConfigResponseV1(FRT_RPCRequest * request) { } +FRTConfigResponseV1::~FRTConfigResponseV1() {} + const vespalib::string & FRTConfigResponseV1::getResponseTypes() const { diff --git a/config/src/vespa/config/frt/frtconfigresponse.h b/config/src/vespa/config/frt/frtconfigresponse.h index 8e7044cee85..02cee28704f 100644 --- a/config/src/vespa/config/frt/frtconfigresponse.h +++ b/config/src/vespa/config/frt/frtconfigresponse.h @@ -21,7 +21,7 @@ private: public: typedef std::unique_ptr<FRTConfigResponse> UP; FRTConfigResponse(FRT_RPCRequest * request); - virtual ~FRTConfigResponse(); + ~FRTConfigResponse(); bool validateResponse() override; bool hasValidResponse() const override; @@ -44,6 +44,7 @@ private: FRTConfigResponseV1& operator=(const FRTConfigResponseV1&); public: FRTConfigResponseV1(FRT_RPCRequest * request); + ~FRTConfigResponseV1(); const ConfigKey & getKey() const override { return _key; } const ConfigValue & getValue() const override { return _value; } diff --git a/config/src/vespa/config/helper/legacysubscriber.cpp b/config/src/vespa/config/helper/legacysubscriber.cpp index 1adde34c4a7..c72ece771da 100644 --- a/config/src/vespa/config/helper/legacysubscriber.cpp +++ b/config/src/vespa/config/helper/legacysubscriber.cpp @@ -10,6 +10,8 @@ LegacySubscriber::LegacySubscriber() { } +LegacySubscriber::~LegacySubscriber() {} + void LegacySubscriber::close() { diff --git a/config/src/vespa/config/helper/legacysubscriber.h b/config/src/vespa/config/helper/legacysubscriber.h index 714e465572d..ed9213d08da 100644 --- a/config/src/vespa/config/helper/legacysubscriber.h +++ b/config/src/vespa/config/helper/legacysubscriber.h @@ -1,9 +1,9 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once +#include "legacy.h" #include "configfetcher.h" #include <vespa/config/subscription/sourcespec.h> -#include "legacy.h" namespace config { @@ -14,6 +14,7 @@ class LegacySubscriber { public: LegacySubscriber(); + ~LegacySubscriber(); const vespalib::string & id() const { return _configId; } template <typename ConfigType> diff --git a/config/src/vespa/config/print/istreamconfigreader.h b/config/src/vespa/config/print/istreamconfigreader.h index b2446104419..6a4cfa1255a 100644 --- a/config/src/vespa/config/print/istreamconfigreader.h +++ b/config/src/vespa/config/print/istreamconfigreader.h @@ -1,7 +1,6 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once -#include <istream> #include "configreader.h" #include "configformatter.h" @@ -16,7 +15,7 @@ class IstreamConfigReader : public ConfigReader<ConfigType> public: IstreamConfigReader(std::istream & is); std::unique_ptr<ConfigType> read(); - std::unique_ptr<ConfigType> read(const ConfigFormatter & formatter); + std::unique_ptr<ConfigType> read(const ConfigFormatter & formatter) override; private: std::istream & _is; }; diff --git a/config/src/vespa/config/print/istreamconfigreader.hpp b/config/src/vespa/config/print/istreamconfigreader.hpp index 2e43fd229e3..358d348c1d9 100644 --- a/config/src/vespa/config/print/istreamconfigreader.hpp +++ b/config/src/vespa/config/print/istreamconfigreader.hpp @@ -1,5 +1,7 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +#include <istream> + namespace config { template <typename ConfigType> diff --git a/config/src/vespa/config/retriever/configretriever.cpp b/config/src/vespa/config/retriever/configretriever.cpp index 711fe5f574d..240ba3bac00 100644 --- a/config/src/vespa/config/retriever/configretriever.cpp +++ b/config/src/vespa/config/retriever/configretriever.cpp @@ -1,7 +1,6 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "configretriever.h" -#include <vespa/config/common/exceptions.h> namespace config { @@ -21,6 +20,8 @@ ConfigRetriever::ConfigRetriever(const ConfigKeySet & bootstrapSet, { } +ConfigRetriever::~ConfigRetriever() {} + ConfigSnapshot ConfigRetriever::getBootstrapConfigs(int timeoutInMillis) { diff --git a/config/src/vespa/config/retriever/configretriever.h b/config/src/vespa/config/retriever/configretriever.h index 8c09dd06ce6..4036822c11c 100644 --- a/config/src/vespa/config/retriever/configretriever.h +++ b/config/src/vespa/config/retriever/configretriever.h @@ -1,13 +1,14 @@ // Copyright 2016 Yahoo 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 <vespa/config/common/configkey.h> -#include <vespa/config/subscription/configsubscription.h> #include "configkeyset.h" #include "configsnapshot.h" #include "genericconfigsubscriber.h" #include "fixedconfigsubscriber.h" +#include <vespa/config/common/configkey.h> +#include <vespa/config/subscription/configsubscription.h> +#include <vespa/vespalib/stllike/string.h> + namespace config { @@ -26,6 +27,7 @@ public: ConfigRetriever(const ConfigKeySet & bootstrapSet, const IConfigContext::SP & context, int64_t subscribeTimeout = DEFAULT_SUBSCRIBE_TIMEOUT); + ~ConfigRetriever(); /** * Waits for the next generation of bootstrap configs to arrive, and returns |