tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix GetInstance() methods for the DbType and config validator registry classes

This commit is contained in:
Gunnar Beutner 2014-11-09 13:06:25 +01:00
parent 4bb535fc47
commit 684ad2641a
4 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/config/configcompiler.cpp
View File

@ -231,3 +231,9 @@ void ConfigCompiler::AddIncludeSearchDir(const String& dir)
m_IncludeSearchDirs.push_back(dir); m_IncludeSearchDirs.push_back(dir);
} }
ConfigFragmentRegistry *ConfigFragmentRegistry::GetInstance(void)
{
return Singleton<ConfigFragmentRegistry>::GetInstance();
}

5
lib/config/configcompiler.hpp
View File

@ -80,10 +80,7 @@ private:
class I2_CONFIG_API ConfigFragmentRegistry : public Registry<ConfigFragmentRegistry, String> class I2_CONFIG_API ConfigFragmentRegistry : public Registry<ConfigFragmentRegistry, String>
{ {
public: public:
static inline ConfigFragmentRegistry *GetInstance(void) static ConfigFragmentRegistry *GetInstance(void);
{
return Singleton<ConfigFragmentRegistry>::GetInstance();
}
}; };
#define REGISTER_CONFIG_FRAGMENT(id, name, fragment) \ #define REGISTER_CONFIG_FRAGMENT(id, name, fragment) \

6
lib/db_ido/dbtype.cpp
View File

@ -125,3 +125,9 @@ std::set<DbType::Ptr> DbType::GetAllTypes(void)
return result; return result;
} }
DbTypeRegistry *DbTypeRegistry::GetInstance(void)
{
return Singleton<DbTypeRegistry>::GetInstance();
}

5
lib/db_ido/dbtype.hpp
View File

@ -82,10 +82,7 @@ private:
class I2_DB_IDO_API DbTypeRegistry : public Registry<DbTypeRegistry, DbType::Ptr> class I2_DB_IDO_API DbTypeRegistry : public Registry<DbTypeRegistry, DbType::Ptr>
{ {
public: public:
static inline DbTypeRegistry *GetInstance(void) static DbTypeRegistry *GetInstance(void);
{
return Singleton<DbTypeRegistry>::GetInstance();
}
}; };
/** /**