From 2b41a6717eedbeec830a82fea2b8ad8a034661a0 Mon Sep 17 00:00:00 2001 From: heck Date: Tue, 30 Mar 2021 02:41:42 +0200 Subject: [PATCH] pEpLog - includes in headers are to be avoided if possible --- src/pEpLog.cc | 6 +++++- src/pEpLog.hh | 17 +++++++---------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/pEpLog.cc b/src/pEpLog.cc index 753eb09..e8f84c0 100644 --- a/src/pEpLog.cc +++ b/src/pEpLog.cc @@ -7,6 +7,10 @@ #include #include +#ifdef ANDROID + #include +#endif + namespace pEp { namespace Adapter { @@ -14,7 +18,7 @@ namespace pEp { std::mutex mtx; - std::atomic_bool is_enabled{false}; + std::atomic_bool is_enabled{ false }; void set_enabled(bool enabled) { diff --git a/src/pEpLog.hh b/src/pEpLog.hh index 2d3fae9..3cb4b7b 100644 --- a/src/pEpLog.hh +++ b/src/pEpLog.hh @@ -6,10 +6,6 @@ #include #include -#ifdef ANDROID - #include -#endif - // pEpLog // ====== // a "to be kept ultra small and simple" logging unit. @@ -36,12 +32,13 @@ do { \ } while (0) #else - #define pEpLog(msg) \ - do { \ - std::stringstream msg_ss; \ - msg_ss << std::this_thread::get_id() << " - " << __FILE__ << "::" << __FUNCTION__ << " - " << msg; \ - pEp::Adapter::pEpLog::log(msg_ss.str()); \ - } while(0) + #define pEpLog(msg) \ + do { \ + std::stringstream msg_ss; \ + msg_ss << std::this_thread::get_id() << " - " << __FILE__ << "::" << __FUNCTION__ \ + << " - " << msg; \ + pEp::Adapter::pEpLog::log(msg_ss.str()); \ + } while (0) #endif // NDEBUG namespace pEp {