X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/53536f012e78a3d28ca1290109667ce2aba794d7..2196a3a0cdc5384c082febb7f4aa5994cc7d80db:/projects/stargazer/plugins/store/firebird/firebird_store.cpp diff --git a/projects/stargazer/plugins/store/firebird/firebird_store.cpp b/projects/stargazer/plugins/store/firebird/firebird_store.cpp index f9a2f78e..fc588fcc 100644 --- a/projects/stargazer/plugins/store/firebird/firebird_store.cpp +++ b/projects/stargazer/plugins/store/firebird/firebird_store.cpp @@ -28,22 +28,15 @@ #include "firebird_store.h" -#include "stg/ibpp.h" -#include "stg/plugin_creator.h" +#include "stg/common.h" #include #include -namespace +extern "C" STG::Store* GetStore() { -PLUGIN_CREATOR frsc; -} - -extern "C" STORE * GetStore(); -//----------------------------------------------------------------------------- -STORE * GetStore() -{ -return frsc.GetPlugin(); + static FIREBIRD_STORE plugin; + return &plugin; } //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- @@ -57,9 +50,8 @@ FIREBIRD_STORE::FIREBIRD_STORE() til(IBPP::ilConcurrency), tlr(IBPP::lrWait), schemaVersion(0), - logger(GetPluginLogger(GetStgLogger(), "store_firebird")) + logger(STG::PluginLogger::get("store_firebird")) { -pthread_mutex_init(&mutex, NULL); } //----------------------------------------------------------------------------- FIREBIRD_STORE::~FIREBIRD_STORE() @@ -69,7 +61,7 @@ db->Disconnect(); //----------------------------------------------------------------------------- int FIREBIRD_STORE::ParseSettings() { -std::vector::iterator i; +std::vector::iterator i; std::string s; for(i = settings.moduleParams.begin(); i != settings.moduleParams.end(); ++i)