Include MODULE_SETTINGS definition in rpcconfig.h

[stg.git] / projects / stargazer / plugin_runner.cpp

diff --git a/projects/stargazer/plugin_runner.cpp b/projects/stargazer/plugin_runner.cpp
index 180713c0706aef614207e5a8eb949fb06e471978..e21bb75df2d50bdd8a647978c177ed759331a9d2 100644 (file)
--- a/projects/stargazer/plugin_runner.cpp
+++ b/projects/stargazer/plugin_runner.cpp
@@ -33,13 +33,13 @@
 #include "conffiles.h"
 
 //-----------------------------------------------------------------------------
 #include "conffiles.h"
 
 //-----------------------------------------------------------------------------

-PLUGIN_RUNNER::PLUGIN_RUNNER(const string & pFileName,
+PLUGIN_RUNNER::PLUGIN_RUNNER(const std::string & pFileName,

                              const MODULE_SETTINGS & ms,
                              ADMINS * a,
                              TARIFFS * t,
                              USERS * u,
                              TRAFFCOUNTER * tc,
                              const MODULE_SETTINGS & ms,
                              ADMINS * a,
                              TARIFFS * t,
                              USERS * u,
                              TRAFFCOUNTER * tc,

-                             BASE_STORE * st,
+                             STORE * st,

                              const SETTINGS * s)
     : pluginFileName(pFileName),
       pluginSettingFileName(),
                              const SETTINGS * s)
     : pluginFileName(pFileName),
       pluginSettingFileName(),


@@ -106,7 +106,7 @@ if (isPluginLoaded)
 isPluginLoaded = 0;
 }
 //-----------------------------------------------------------------------------
 isPluginLoaded = 0;
 }
 //-----------------------------------------------------------------------------

-BASE_PLUGIN * PLUGIN_RUNNER::GetPlugin()
+PLUGIN * PLUGIN_RUNNER::GetPlugin()

 {
 return plugin;
 }
 {
 return plugin;
 }


@@ -168,16 +168,16 @@ libHandle = dlopen(pluginFileName.c_str(), RTLD_NOW);
 
 if (!libHandle)
     {
 
 if (!libHandle)
     {

-    errorStr = string("Plugin loading failed. ") + dlerror();
+    errorStr = std::string("Plugin loading failed. ") + dlerror();

     printfd(__FILE__, "%s\n", errorStr.c_str());
     return -1;
     }
 
     printfd(__FILE__, "%s\n", errorStr.c_str());
     return -1;
     }
 

-BASE_PLUGIN * (*GetPlugin)();
-GetPlugin = (BASE_PLUGIN * (*)())dlsym(libHandle, "GetPlugin");
+PLUGIN * (*GetPlugin)();
+GetPlugin = (PLUGIN * (*)())dlsym(libHandle, "GetPlugin");

 if (!GetPlugin)
     {
 if (!GetPlugin)
     {

-    errorStr = string("GetPlugin() not found. ") + dlerror();
+    errorStr = std::string("GetPlugin() not found. ") + dlerror();

     return -1;
     }
 plugin = GetPlugin();
     return -1;
     }
 plugin = GetPlugin();


@@ -216,7 +216,7 @@ if (isPluginLoaded)
 return 0;
 }
 //-----------------------------------------------------------------------------
 return 0;
 }
 //-----------------------------------------------------------------------------

-const string & PLUGIN_RUNNER::GetStrError() const
+const std::string & PLUGIN_RUNNER::GetStrError() const

 {
 return errorStr;
 }
 {
 return errorStr;
 }


@@ -231,4 +231,3 @@ uint16_t PLUGIN_RUNNER::GetStopPosition() const
 return plugin->GetStopPosition();
 }
 //-----------------------------------------------------------------------------
 return plugin->GetStopPosition();
 }
 //-----------------------------------------------------------------------------

-