From 31d98fc9651609cc29b9838475ec9b7efda769c1 Mon Sep 17 00:00:00 2001 From: Michael Davidsaver Date: Sat, 12 Jan 2019 14:29:35 -0800 Subject: [PATCH] attempt to please MSVC Seems not to elide some calls to Configure::operator=() --- src/utils/pv/configuration.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/utils/pv/configuration.h b/src/utils/pv/configuration.h index f62c706..ccba220 100644 --- a/src/utils/pv/configuration.h +++ b/src/utils/pv/configuration.h @@ -134,11 +134,13 @@ protected: //! Lookup configuration strings from an in memory store class epicsShareClass ConfigurationMap: public Configuration { + EPICS_NOT_COPYABLE(ConfigurationMap) public: typedef std::map properties_t; properties_t properties; ConfigurationMap() {} ConfigurationMap(const properties_t& p) :properties(p) {} + virtual ~ConfigurationMap() {} private: virtual bool tryGetPropertyAsString(const std::string& name, std::string* val) const; virtual void addKeys(keys_t&) const; @@ -147,6 +149,10 @@ private: //! Lookup configuration strings from the process environment class epicsShareClass ConfigurationEnviron: public Configuration { + EPICS_NOT_COPYABLE(ConfigurationEnviron) +public: + ConfigurationEnviron() {} + virtual ~ConfigurationEnviron() {} private: virtual bool tryGetPropertyAsString(const std::string& name, std::string* val) const; }; @@ -157,11 +163,14 @@ typedef ConfigurationEnviron SystemConfigurationImpl; //! Most recently push'd is checked first. class epicsShareClass ConfigurationStack : public Configuration { + EPICS_NOT_COPYABLE(ConfigurationStack) typedef std::vector > confs_t; confs_t confs; virtual bool tryGetPropertyAsString(const std::string& name, std::string* val) const; virtual void addKeys(keys_t&) const; public: + ConfigurationStack() {} + virtual ~ConfigurationStack() {} inline void push_back(const confs_t::value_type& conf) { confs.push_back(conf); } @@ -227,6 +236,7 @@ public: class ConfigurationProviderImpl: public ConfigurationProvider { + EPICS_NOT_COPYABLE(ConfigurationProviderImpl) public: ConfigurationProviderImpl() {} /**