Core/Common: Move singleton instances into compilation units

* Fixes issues when building shared libraries
  (prevents gcc and clang from providing several instance)

2 files changed, 7 insertions, 5 deletions

diff --git a/src/common/Logging/Log.cpp b/src/common/Logging/Log.cpp
index dff0351d52d..b350a41b482 100644
--- a/src/common/Logging/Log.cpp
+++ b/src/common/Logging/Log.cpp
@@ -321,6 +321,12 @@ void Log::Close()
     appenders.clear();
 }
 
+Log* Log::instance()
+{
+    static Log instance;
+    return &instance;
+}
+
 void Log::Initialize(boost::asio::io_service* ioService)
 {
     if (ioService)
diff --git a/src/common/Logging/Log.h b/src/common/Logging/Log.h
index eafd7412a94..062f14d525c 100644
--- a/src/common/Logging/Log.h
+++ b/src/common/Logging/Log.h
@@ -44,11 +44,7 @@ class Log
 
     public:
 
-        static Log* instance()
-        {
-            static Log instance;
-            return &instance;
-        }
+        static Log* instance();
 
         void Initialize(boost::asio::io_service* ioService);
         void SetSynchronous();  // Not threadsafe - should only be called from main() after all threads are joined