Further ensure that we do not generate code for expensive methods more than once.

6 files changed, 10 insertions, 2 deletions

diff --git a/config/src/vespa/config/common/configkey.cpp b/config/src/vespa/config/common/configkey.cpp
index c22042418c0..fa99dddf12e 100644
--- a/config/src/vespa/config/common/configkey.cpp
+++ b/config/src/vespa/config/common/configkey.cpp
@@ -39,6 +39,8 @@ ConfigKey::ConfigKey()
       _key()
 {}
 
+ConfigKey::~ConfigKey() { }
+
 bool
 ConfigKey::operator<(const ConfigKey & rhs) const
 {
diff --git a/config/src/vespa/config/common/configkey.h b/config/src/vespa/config/common/configkey.h
index f6938a4fa1b..9f22c154757 100644
--- a/config/src/vespa/config/common/configkey.h
+++ b/config/src/vespa/config/common/configkey.h
@@ -20,6 +20,7 @@ public:
               const std::vector<vespalib::string> & defSchema);
 
     ConfigKey();
+    ~ConfigKey();
 
     bool operator<(const ConfigKey & rhs) const;
     bool operator>(const ConfigKey & rhs) const;
diff --git a/config/src/vespa/config/common/configmanager.cpp b/config/src/vespa/config/common/configmanager.cpp
index e510079239f..4c93ddcf8e4 100644
--- a/config/src/vespa/config/common/configmanager.cpp
+++ b/config/src/vespa/config/common/configmanager.cpp
@@ -19,8 +19,9 @@ ConfigManager::ConfigManager(SourceFactory::UP sourceFactory, int64_t initialGen
       _lock(),
       _firstLock(),
       _first(true)
-{
-}
+{ }
+
+ConfigManager::~ConfigManager() { }
 
 ConfigSubscription::SP
 ConfigManager::subscribe(const ConfigKey & key, uint64_t timeoutInMillis)
diff --git a/config/src/vespa/config/common/configmanager.h b/config/src/vespa/config/common/configmanager.h
index 2c3d5cbe297..9cd46750959 100644
--- a/config/src/vespa/config/common/configmanager.h
+++ b/config/src/vespa/config/common/configmanager.h
@@ -22,6 +22,7 @@ class ConfigManager : public IConfigManager
 {
 public:
     ConfigManager(SourceFactory::UP sourceFactory, int64_t initialGeneration);
+    ~ConfigManager();
 
     // Implements IConfigManager
     ConfigSubscription::SP subscribe(const ConfigKey & key, uint64_t timeoutInMillis);
diff --git a/config/src/vespa/config/common/configvalue.cpp b/config/src/vespa/config/common/configvalue.cpp
index 6577982dc64..97706d25401 100644
--- a/config/src/vespa/config/common/configvalue.cpp
+++ b/config/src/vespa/config/common/configvalue.cpp
@@ -24,6 +24,8 @@ ConfigValue::ConfigValue(const PayloadPtr & payload, const vespalib::string & md
 {
 }
 
+ConfigValue::~ConfigValue() { }
+
 int
 ConfigValue::operator==(const ConfigValue & rhs) const
 {
diff --git a/config/src/vespa/config/common/configvalue.h b/config/src/vespa/config/common/configvalue.h
index b6315c51081..ee877352c69 100644
--- a/config/src/vespa/config/common/configvalue.h
+++ b/config/src/vespa/config/common/configvalue.h
@@ -22,6 +22,7 @@ public:
     ConfigValue(const std::vector<vespalib::string> & lines, const vespalib::string & md5sum);
     ConfigValue(const PayloadPtr & data, const vespalib::string & md5sum);
     ConfigValue();
+    ~ConfigValue();
 
     int operator==(const ConfigValue & rhs) const;
     int operator!=(const ConfigValue & rhs) const;