firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-23 07:23:04 +01:00
Code Issues

Do not use as GlobalPtr class with ctor which needs context pool (i.e. TLS object)

Browse Source
This commit is contained in:
alexpeshkoff 2013-06-06 12:29:04 +00:00
parent 5780811da4
commit 808271e1bf
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/yvalve/PluginManager.cpp
View File

@ -93,8 +93,8 @@ namespace
class StaticConfHolder class StaticConfHolder
{ {
public: public:
explicit StaticConfHolder(MemoryPool&) explicit StaticConfHolder(MemoryPool& p)
: confFile(FB_NEW(*getDefaultMemoryPool()) ConfigFile(*getDefaultMemoryPool(), : confFile(FB_NEW(p) ConfigFile(p,
fb_utils::getPrefix(fb_utils::FB_DIR_CONF, "plugins.conf"), ConfigFile::HAS_SUB_CONF)) fb_utils::getPrefix(fb_utils::FB_DIR_CONF, "plugins.conf"), ConfigFile::HAS_SUB_CONF))
{ {
} }
@ -107,11 +107,11 @@ namespace
private: private:
RefPtr<ConfigFile> confFile; RefPtr<ConfigFile> confFile;
}; };
GlobalPtr<StaticConfHolder> pluginsConf; InitInstance<StaticConfHolder> pluginsConf;
RefPtr<ConfigFile> findConfig(const char* param, const char* pluginName) RefPtr<ConfigFile> findConfig(const char* param, const char* pluginName)
{ {
ConfigFile* f = pluginsConf->get(); ConfigFile* f = pluginsConf().get();
if (f) if (f)
{ {
const ConfigFile::Parameter* plugPar = f->findParameter(param, pluginName); const ConfigFile::Parameter* plugPar = f->findParameter(param, pluginName);