Merge pull request #2 from bobr-kun/MySQL_custom_port

[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 e8d625a0f105b1f137c9a64514431e8f7b758c2f..60514f4a9d311de3d7f6f971df5cff24b31921da 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:


@@ -49,11 +49,13 @@ class PLUGIN_LOGGER
 friend PLUGIN_LOGGER GetPluginLogger(const STG_LOGGER& logger, const std::string& pluginName);
 
 public:
 friend PLUGIN_LOGGER GetPluginLogger(const STG_LOGGER& logger, const std::string& pluginName);
 
 public:

-    PLUGIN_LOGGER(const PLUGIN_LOGGER& rhs) : m_parent(rhs.m_parent), m_pluginName(rhs.m_pluginName) {}
+    PLUGIN_LOGGER(const PLUGIN_LOGGER& rhs) : m_parent(rhs.m_parent), m_pluginName(rhs.m_pluginName) {} // Need move here.

     void operator()(const char* fmt, ...) const;
     void operator()(const std::string& line) const;
 
 private:
     void operator()(const char* fmt, ...) const;
     void operator()(const std::string& line) const;
 
 private:

+    PLUGIN_LOGGER& operator=(const PLUGIN_LOGGER&); // Copy assignment is prohibited.
+

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