]> granicus.if.org Git - icinga2/commitdiff
Fix GetInstance() methods for the DbType and config validator registry classes
authorGunnar Beutner <gunnar.beutner@netways.de>
Sun, 9 Nov 2014 12:06:25 +0000 (13:06 +0100)
committerGunnar Beutner <gunnar.beutner@netways.de>
Sun, 9 Nov 2014 12:06:25 +0000 (13:06 +0100)
lib/config/configcompiler.cpp
lib/config/configcompiler.hpp
lib/db_ido/dbtype.cpp
lib/db_ido/dbtype.hpp

index 9d61ec2da51ee7bdd436549e30d7586d0f2595c9..19c78f4660f0ebf4af9cac5e9e32d4a5fc0d62f8 100644 (file)
@@ -231,3 +231,9 @@ void ConfigCompiler::AddIncludeSearchDir(const String& dir)
 
        m_IncludeSearchDirs.push_back(dir);
 }
+
+ConfigFragmentRegistry *ConfigFragmentRegistry::GetInstance(void)
+{
+       return Singleton<ConfigFragmentRegistry>::GetInstance();
+}
+
index 3d1968bdb5cb13d69d425551c2df1c60ffbc4027..3c3dd0dd138fd2ee3602ac96ead31be3272857de 100644 (file)
@@ -80,10 +80,7 @@ private:
 class I2_CONFIG_API ConfigFragmentRegistry : public Registry<ConfigFragmentRegistry, String>
 {
 public:
-       static inline ConfigFragmentRegistry *GetInstance(void)
-       {
-               return Singleton<ConfigFragmentRegistry>::GetInstance();
-       }
+       static ConfigFragmentRegistry *GetInstance(void);
 };
 
 #define REGISTER_CONFIG_FRAGMENT(id, name, fragment) \
index ca96498d7ecf75ed463d9faaecda374c8b210ebf..2f197e618fb2b24a305a78d6b33931519303dec0 100644 (file)
@@ -125,3 +125,9 @@ std::set<DbType::Ptr> DbType::GetAllTypes(void)
 
        return result;
 }
+
+DbTypeRegistry *DbTypeRegistry::GetInstance(void)
+{
+       return Singleton<DbTypeRegistry>::GetInstance();
+}
+
index 199a04b2c3fae1722cc907b2c4b2a0be1ed6cc58..fda97ffc7663ce7e6eeddafecd6f98a5d00c5427 100644 (file)
@@ -82,10 +82,7 @@ private:
 class I2_DB_IDO_API DbTypeRegistry : public Registry<DbTypeRegistry, DbType::Ptr>
 {
 public:
-       static inline DbTypeRegistry *GetInstance(void)
-       {
-               return Singleton<DbTypeRegistry>::GetInstance();
-       }
+       static DbTypeRegistry *GetInstance(void);
 };
 
 /**