Removing GetUserParam from rscript

[stg.git] / 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 3085981fc222ec6e82b9875c78f120d88b11522a..9cc7c3048b3462d088cd91ee21c94c6f307f4603 100644 (file)
--- a/projects/stargazer/plugins/store/firebird/firebird_store.cpp
+++ b/projects/stargazer/plugins/store/firebird/firebird_store.cpp
@@ -34,9 +34,12 @@
 #include "stg/plugin_creator.h"
 #include "firebird_store.h"
 
 #include "stg/plugin_creator.h"
 #include "firebird_store.h"
 

-using namespace std;
-
+namespace
+{

 PLUGIN_CREATOR<FIREBIRD_STORE> frsc;
 PLUGIN_CREATOR<FIREBIRD_STORE> frsc;

+}
+
+extern "C" STORE * GetStore();

 //-----------------------------------------------------------------------------
 STORE * GetStore()
 {
 //-----------------------------------------------------------------------------
 STORE * GetStore()
 {


@@ -56,7 +59,8 @@ FIREBIRD_STORE::FIREBIRD_STORE()
       db(),
       mutex(),
       til(IBPP::ilConcurrency),
       db(),
       mutex(),
       til(IBPP::ilConcurrency),

-      tlr(IBPP::lrWait)
+      tlr(IBPP::lrWait),
+      logger(GetPluginLogger(GetStgLogger(), "store_firebird"))

 {
 pthread_mutex_init(&mutex, NULL);
 }
 {
 pthread_mutex_init(&mutex, NULL);
 }


@@ -68,13 +72,13 @@ db->Disconnect();
 //-----------------------------------------------------------------------------
 int FIREBIRD_STORE::ParseSettings()
 {
 //-----------------------------------------------------------------------------
 int FIREBIRD_STORE::ParseSettings()
 {

-vector<PARAM_VALUE>::iterator i;
-string s;
+std::vector<PARAM_VALUE>::iterator i;
+std::string s;

 
 for(i = settings.moduleParams.begin(); i != settings.moduleParams.end(); ++i)
     {
     s = i->param;
 
 for(i = settings.moduleParams.begin(); i != settings.moduleParams.end(); ++i)
     {
     s = i->param;

-    transform(s.begin(), s.end(), s.begin(), ToLower());
+    std::transform(s.begin(), s.end(), s.begin(), ToLower());

     if (s == "server")
         {
         db_server = *(i->value.begin());
     if (s == "server")
         {
         db_server = *(i->value.begin());