Ticket 52. Definition of the tariff pointer added to the

[stg.git] / stglibs / logger.lib / include / stg / logger.h

diff --git a/stglibs/logger.lib/include/stg/logger.h b/stglibs/logger.lib/include/stg/logger.h
index 115d1fb3907a71e63e2c798cf3f1d18d3cd60a08..5165f0fb7203b540fa69bac94f18564e1768aa8c 100644 (file)
--- a/stglibs/logger.lib/include/stg/logger.h
+++ b/stglibs/logger.lib/include/stg/logger.h
@@ -1,17 +1,17 @@
 #ifndef STG_LOGGER_H
 #define STG_LOGGER_H
 
 #ifndef STG_LOGGER_H
 #define STG_LOGGER_H
 

-#include <pthread.h>
-

 #include <string>
 
 #include <string>
 

+#include <pthread.h>
+

 class STG_LOGGER;
 STG_LOGGER & GetStgLogger();
 //-----------------------------------------------------------------------------
 class STG_LOGGER_LOCKER
 {
 public:
 class STG_LOGGER;
 STG_LOGGER & GetStgLogger();
 //-----------------------------------------------------------------------------
 class STG_LOGGER_LOCKER
 {
 public:

-    STG_LOGGER_LOCKER(pthread_mutex_t * m) : mutex(m) { pthread_mutex_lock(mutex); }
+    explicit STG_LOGGER_LOCKER(pthread_mutex_t * m) : mutex(m) { pthread_mutex_lock(mutex); }

     ~STG_LOGGER_LOCKER() { pthread_mutex_unlock(mutex); }
 
 private:
     ~STG_LOGGER_LOCKER() { pthread_mutex_unlock(mutex); }
 
 private:


@@ -44,18 +44,19 @@ private:
     mutable pthread_mutex_t mutex;
 };
 //-----------------------------------------------------------------------------
     mutable pthread_mutex_t mutex;
 };
 //-----------------------------------------------------------------------------

-class PLUGIN_LOGGER : private STG_LOGGER
+class PLUGIN_LOGGER

 {
 {

-friend PLUGIN_LOGGER GetPluginLogger(const STG_LOGGER & logger, const std::string & pluginName);
+friend PLUGIN_LOGGER GetPluginLogger(const STG_LOGGER& logger, const std::string& pluginName);

 
 public:
 
 public:

-    PLUGIN_LOGGER(const PLUGIN_LOGGER & rhs);
-    void operator()(const char * fmt, ...) const;
-    void operator()(const std::string & line) const;
+    PLUGIN_LOGGER(const PLUGIN_LOGGER& rhs) : m_parent(rhs.m_parent), m_pluginName(rhs.m_pluginName) {}
+    void operator()(const char* fmt, ...) const;
+    void operator()(const std::string& line) const;

 
 private:
     PLUGIN_LOGGER(const STG_LOGGER & logger, const std::string & pn);
 
 private:
     PLUGIN_LOGGER(const STG_LOGGER & logger, const std::string & pn);

-    std::string pluginName;
+    const STG_LOGGER& m_parent;
+    std::string m_pluginName;

 };
 
 PLUGIN_LOGGER GetPluginLogger(const STG_LOGGER & logger, const std::string & pluginName);
 };
 
 PLUGIN_LOGGER GetPluginLogger(const STG_LOGGER & logger, const std::string & pluginName);