From e105634189aae6b3a6010689f85dc8022d64a193 Mon Sep 17 00:00:00 2001 From: heck Date: Thu, 22 Jul 2021 13:34:59 +0200 Subject: [PATCH] use solution pattern from pEp/platform_windows.h for windows compat (Move this to engine via PR, once working) --- src/pEpLog.cc | 2 +- src/pEpLog.hh | 13 +++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/pEpLog.cc b/src/pEpLog.cc index 733c517..f283b6b 100644 --- a/src/pEpLog.cc +++ b/src/pEpLog.cc @@ -115,7 +115,7 @@ namespace pEp { void pEpLogger::log(const string& msg, Utils::Color col) const { std::stringstream msg_; - msg_ << "[" << _getpid() << " " << std::this_thread::get_id() << "]"; + msg_ << "[" << getpid() << " " << std::this_thread::get_id() << "]"; msg_ << " - "; msg_ << this->get_classname() << "[" << this->get_instancename() << "]"; msg_ << " - " << msg; diff --git a/src/pEpLog.hh b/src/pEpLog.hh index 74b6fd4..7ecf2fc 100644 --- a/src/pEpLog.hh +++ b/src/pEpLog.hh @@ -11,6 +11,11 @@ // Win - process.h #ifdef WIN32 #include + // TODO: once this works, move this to pEpEngine platform_windows.h and file a PR + #ifndef getpid + #define getpid() _getpid() + #endif + #else #include #endif @@ -49,7 +54,7 @@ do { \ if (pEp::Adapter::pEpLog::get_enabled()) { \ std::stringstream msg_; \ - msg_ << "[" << _getpid() << " " << std::this_thread::get_id() << "]"; \ + msg_ << "[" << getpid() << " " << std::this_thread::get_id() << "]"; \ msg_ << " - " << __FILE__ << "::" << __FUNCTION__; \ msg_ << " - " << msg; \ pEp::Adapter::pEpLog::log(msg_.str()); \ @@ -67,7 +72,7 @@ do { \ if (pEp::Adapter::pEpLog::get_enabled()) { \ std::stringstream msg_; \ - msg_ << "[" << _getpid() << " " << std::this_thread::get_id() << "]"; \ + msg_ << "[" << getpid() << " " << std::this_thread::get_id() << "]"; \ msg_ << " - " << __FILE__ << "::" << __FUNCTION__; \ msg_ << " - " << pEp::Adapter::pEpLog::decorateH1(msg); \ pEp::Adapter::pEpLog::log(msg_.str()); \ @@ -85,7 +90,7 @@ do { \ if (pEp::Adapter::pEpLog::get_enabled()) { \ std::stringstream msg_; \ - msg_ << "[" << _getpid() << " " << std::this_thread::get_id() << "]"; \ + msg_ << "[" << getpid() << " " << std::this_thread::get_id() << "]"; \ msg_ << " - " << __FILE__ << "::" << __FUNCTION__; \ msg_ << " - " << pEp::Adapter::pEpLog::decorateH2(msg); \ pEp::Adapter::pEpLog::log(msg_.str()); \ @@ -176,7 +181,7 @@ namespace pEp { #define pEpLogClass(msg) \ do { \ std::stringstream msg_; \ - msg_ << "[" << _getpid() << " " << std::this_thread::get_id() << "]"; \ + msg_ << "[" << getpid() << " " << std::this_thread::get_id() << "]"; \ msg_ << " - " << this->m4gic_logger_n4me.get_classname(); \ msg_ << "[" << this->m4gic_logger_n4me.get_instancename() << "]"; \ msg_ << "::" << __FUNCTION__; \