Merge remote-tracking branch 'origin/stg-2.409' into ticket37

[stg.git] / projects / stargazer / plugins / store / files / file_store.h

diff --git a/projects/stargazer/plugins/store/files/file_store.h b/projects/stargazer/plugins/store/files/file_store.h
index 91fb7fa80c2e9df371d9fc4dccbe90db7f7c3aed..1d72f287d01dac7e1108b4e69bf97a62db3ccd3a 100644 (file)
--- a/projects/stargazer/plugins/store/files/file_store.h
+++ b/projects/stargazer/plugins/store/files/file_store.h
@@ -37,9 +37,8 @@
 #include "stg/store.h"
 #include "stg/conffiles.h"
 #include "stg/user_traff.h"
 #include "stg/store.h"
 #include "stg/conffiles.h"
 #include "stg/user_traff.h"

+#include "stg/logger.h"

 
 

-//-----------------------------------------------------------------------------
-extern "C" STORE * GetStore();

 //-----------------------------------------------------------------------------
 class FILES_STORE_SETTINGS {
 public:
 //-----------------------------------------------------------------------------
 class FILES_STORE_SETTINGS {
 public:


@@ -198,11 +197,13 @@ private:
     int RemoveDir(const char * path) const;
     int Touch(const std::string & path) const;
 
     int RemoveDir(const char * path) const;
     int Touch(const std::string & path) const;
 

-    mutable string errorStr;
+    mutable std::string errorStr;

     std::string version;
     FILES_STORE_SETTINGS storeSettings;
     MODULE_SETTINGS settings;
     mutable pthread_mutex_t mutex;
     std::string version;
     FILES_STORE_SETTINGS storeSettings;
     MODULE_SETTINGS settings;
     mutable pthread_mutex_t mutex;

+
+    PLUGIN_LOGGER logger;

 };
 //-----------------------------------------------------------------------------
 
 };
 //-----------------------------------------------------------------------------