From 93b82767eb0d69803829ac57c4bf6cd724de3334 Mon Sep 17 00:00:00 2001 From: NicolasWinckler Date: Wed, 4 Nov 2015 10:54:33 +0100 Subject: [PATCH] correct some coverity issues and add empty string to the logger if boost version = 1,59.0 --- fairmq/logger/logger.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/fairmq/logger/logger.h b/fairmq/logger/logger.h index 7d0f0f4c..60b9bc5a 100644 --- a/fairmq/logger/logger.h +++ b/fairmq/logger/logger.h @@ -26,7 +26,7 @@ #include #include - +#include // WARNING : pragma commands to hide boost Wshadow warning @@ -142,8 +142,15 @@ void init_log_formatter(const boost::log::record_view &view, boost::log::formatt // helper macros // global macros (core). Level filters are set globally here, that is to all register sinks +// add empty string if boost 1.59.0 (see : https://svn.boost.org/trac/boost/ticket/11549 ) +#if BOOST_VERSION == 105900 +#define LOG(severity) BOOST_LOG_SEV(global_logger::get(),custom_severity_level::severity) << "" +#define MQLOG(severity) BOOST_LOG_SEV(global_logger::get(),custom_severity_level::severity) << "" +#else #define LOG(severity) BOOST_LOG_SEV(global_logger::get(),custom_severity_level::severity) #define MQLOG(severity) BOOST_LOG_SEV(global_logger::get(),custom_severity_level::severity) +#endif + #define SET_LOG_LEVEL(loglevel) boost::log::core::get()->set_filter(severity >= custom_severity_level::loglevel); #define SET_LOG_FILTER(op,loglevel) set_global_log_level(log_op::op,custom_severity_level::loglevel)