diff --git a/src/Log.cpp b/src/Log.cpp index 001f7b2..45136ef 100644 --- a/src/Log.cpp +++ b/src/Log.cpp @@ -2,40 +2,13 @@ #include "Platform.h" #include "StringUtils.h" +#include "ProcessUtils.h" #include #include -#ifdef PLATFORM_UNIX -#include -#include -#include -#endif - Log m_globalLog; -#ifdef PLATFORM_UNIX -pid_t currentProcessId = 0; -pid_t processId() -{ - if (currentProcessId == 0) - { - currentProcessId = getpid(); - } - return currentProcessId; -} -#else -DWORD currentProcessId = 0; -DWORD processId() -{ - if (currentProcessId == 0) - { - currentProcessId = GetCurrentProcessId(); - } - return currentProcessId; -} -#endif - Log* Log::instance() { return &m_globalLog; @@ -68,7 +41,7 @@ void Log::writeToStream(std::ostream& stream, Type type, const char* text) stream << "ERROR "; break; } - stream << '(' << intToStr(processId()) << ") " << text << std::endl; + stream << '(' << intToStr(ProcessUtils::currentProcessId()) << ") " << text << std::endl; } void Log::write(Type type, const char* text)