diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2022-02-07 15:28:47 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2022-02-07 15:28:47 +0000 |
commit | d11a831d24165bc0263aa9a6b015940003c3d660 (patch) | |
tree | 6facccc1d53f4090b60d476a507728ddb3e3fae1 /config | |
parent | 4c5a7cac411b30b9b4bd3ca067efcc9f3719b0ea (diff) |
Add explicit on constructor and deinline destructors.
Diffstat (limited to 'config')
9 files changed, 32 insertions, 19 deletions
diff --git a/config/src/vespa/config/common/configvalue.h b/config/src/vespa/config/common/configvalue.h index a1f92738d0c..c071b3cfd7c 100644 --- a/config/src/vespa/config/common/configvalue.h +++ b/config/src/vespa/config/common/configvalue.h @@ -17,7 +17,7 @@ typedef std::shared_ptr<const protocol::Payload> PayloadPtr; */ class ConfigValue { public: - ConfigValue(StringVector lines); + explicit ConfigValue(StringVector lines); ConfigValue(StringVector lines, const vespalib::string & xxhash); ConfigValue(PayloadPtr data, const vespalib::string & xxhash); ConfigValue(); diff --git a/config/src/vespa/config/common/types.h b/config/src/vespa/config/common/types.h index c6663c7f3f8..b59685ffaa0 100644 --- a/config/src/vespa/config/common/types.h +++ b/config/src/vespa/config/common/types.h @@ -7,16 +7,15 @@ namespace config { -typedef std::vector<vespalib::string> StringVector; -typedef std::vector<bool> BoolVector; -typedef std::vector<double> DoubleVector; -typedef std::vector<int64_t> LongVector; -typedef std::vector<int32_t> IntVector; -typedef std::map<vespalib::string, vespalib::string> StringMap; -typedef std::map<vespalib::string, bool> BoolMap; -typedef std::map<vespalib::string, double> DoubleMap; -typedef std::map<vespalib::string, int64_t> LongMap; -typedef std::map<vespalib::string, int32_t> IntMap; - -} // namespace common +using StringVector = std::vector<vespalib::string>; +using BoolVector = std::vector<bool>; +using DoubleVector = std::vector<double>; +using LongVector = std::vector<int64_t>; +using IntVector = std::vector<int32_t>; +using StringMap = std::map<vespalib::string, vespalib::string>; +using BoolMap = std::map<vespalib::string, bool>; +using DoubleMap = std::map<vespalib::string, double>; +using LongMap = std::map<vespalib::string, int64_t>; +using IntMap = std::map<vespalib::string, int32_t>; +} diff --git a/config/src/vespa/config/set/configsetsourcefactory.cpp b/config/src/vespa/config/set/configsetsourcefactory.cpp index 136d1fd6353..9d443cdaabc 100644 --- a/config/src/vespa/config/set/configsetsourcefactory.cpp +++ b/config/src/vespa/config/set/configsetsourcefactory.cpp @@ -8,6 +8,8 @@ ConfigSetSourceFactory::ConfigSetSourceFactory(BuilderMapSP builderMap) { } +ConfigSetSourceFactory::~ConfigSetSourceFactory() = default; + std::unique_ptr<Source> ConfigSetSourceFactory::createSource(std::shared_ptr<IConfigHolder> holder, const ConfigKey & key) const { diff --git a/config/src/vespa/config/set/configsetsourcefactory.h b/config/src/vespa/config/set/configsetsourcefactory.h index ca18142312f..c42e14a7c84 100644 --- a/config/src/vespa/config/set/configsetsourcefactory.h +++ b/config/src/vespa/config/set/configsetsourcefactory.h @@ -17,8 +17,8 @@ class ConfigSetSourceFactory : public SourceFactory { public: using BuilderMapSP = ConfigSetSource::BuilderMapSP; - ConfigSetSourceFactory(BuilderMapSP builderMap); - + explicit ConfigSetSourceFactory(BuilderMapSP builderMap); + ~ConfigSetSourceFactory() override; std::unique_ptr<Source> createSource(std::shared_ptr<IConfigHolder> holder, const ConfigKey & key) const override; private: BuilderMapSP _builderMap; diff --git a/config/src/vespa/config/subscription/confighandle.h b/config/src/vespa/config/subscription/confighandle.h index fd8218aec17..98a3e844acd 100644 --- a/config/src/vespa/config/subscription/confighandle.h +++ b/config/src/vespa/config/subscription/confighandle.h @@ -17,7 +17,8 @@ class ConfigHandle public: typedef std::unique_ptr<ConfigHandle <ConfigType> > UP; - ConfigHandle(std::shared_ptr<ConfigSubscription> subscription); + explicit ConfigHandle(std::shared_ptr<ConfigSubscription> subscription); + ~ConfigHandle(); /** * Return the currently available config known to the ConfigHandle. Throws diff --git a/config/src/vespa/config/subscription/confighandle.hpp b/config/src/vespa/config/subscription/confighandle.hpp index 123ed55e4b8..9ad27a5cb3f 100644 --- a/config/src/vespa/config/subscription/confighandle.hpp +++ b/config/src/vespa/config/subscription/confighandle.hpp @@ -12,6 +12,9 @@ ConfigHandle<ConfigType>::ConfigHandle(std::shared_ptr<ConfigSubscription> subsc } template <typename ConfigType> +ConfigHandle<ConfigType>::~ConfigHandle() = default; + +template <typename ConfigType> std::unique_ptr<ConfigType> ConfigHandle<ConfigType>::getConfig() const { diff --git a/config/src/vespa/config/subscription/configsubscriber.cpp b/config/src/vespa/config/subscription/configsubscriber.cpp index 1cdb06fe306..0645481a1f5 100644 --- a/config/src/vespa/config/subscription/configsubscriber.cpp +++ b/config/src/vespa/config/subscription/configsubscriber.cpp @@ -15,6 +15,8 @@ ConfigSubscriber::ConfigSubscriber(const SourceSpec & spec) : _set(std::make_shared<ConfigContext>(spec)) { } +ConfigSubscriber::~ConfigSubscriber() = default; + bool ConfigSubscriber::nextConfig(milliseconds timeoutInMillis) { diff --git a/config/src/vespa/config/subscription/configsubscriber.h b/config/src/vespa/config/subscription/configsubscriber.h index 719cb5d1bc9..fd6497155fc 100644 --- a/config/src/vespa/config/subscription/configsubscriber.h +++ b/config/src/vespa/config/subscription/configsubscriber.h @@ -45,7 +45,10 @@ public: * * @param context A ConfigContext shared between all subscribers. */ - ConfigSubscriber(std::shared_ptr<IConfigContext> context); + explicit ConfigSubscriber(std::shared_ptr<IConfigContext> context); + ConfigSubscriber(const ConfigSubscriber &) = delete; + ConfigSubscriber & operator= (const ConfigSubscriber &) = delete; + ~ConfigSubscriber(); /** * Checks if one or more of the configs in the set is updated or not. diff --git a/config/src/vespa/config/subscription/configsubscriptionset.h b/config/src/vespa/config/subscription/configsubscriptionset.h index 35f29499786..89c74a97be2 100644 --- a/config/src/vespa/config/subscription/configsubscriptionset.h +++ b/config/src/vespa/config/subscription/configsubscriptionset.h @@ -3,9 +3,10 @@ #pragma once #include "subscriptionid.h" -#include "configprovider.h" #include <atomic> #include <chrono> +#include <memory> +#include <vector> namespace config { @@ -27,8 +28,10 @@ public: * * @param context A ConfigContext shared between all subscriptions. */ - ConfigSubscriptionSet(std::shared_ptr<IConfigContext> context); + explicit ConfigSubscriptionSet(std::shared_ptr<IConfigContext> context); + ConfigSubscriptionSet(const ConfigSubscriptionSet &) = delete; + ConfigSubscriptionSet & operator= (const ConfigSubscriptionSet &) = delete; ~ConfigSubscriptionSet(); /** |