From bb06c65d5e1a761dc27d80a20d059f4a7c76a3c2 Mon Sep 17 00:00:00 2001 From: lethe555 Date: Tue, 23 Jun 2015 15:42:32 +0800 Subject: [PATCH 1/2] streaming SPDLOG_DEBUG --- include/spdlog/spdlog.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/include/spdlog/spdlog.h b/include/spdlog/spdlog.h index 5cec5623..ab94bc96 100644 --- a/include/spdlog/spdlog.h +++ b/include/spdlog/spdlog.h @@ -134,18 +134,19 @@ void drop_all(); // Example: // spdlog::set_level(spdlog::level::debug); // SPDLOG_DEBUG(my_logger, "Some debug message {} {}", 1, 3.2); +// SPDLOG_DEBUG(my_logger) << "Some debug message"; /////////////////////////////////////////////////////////////////////////////// #ifdef SPDLOG_TRACE_ON -#define SPDLOG_TRACE(logger, ...) logger->trace(__VA_ARGS__) << " (" << __FILE__ << " #" << __LINE__ <<")"; +#define SPDLOG_TRACE(logger, ...) logger->trace(__VA_ARGS__) << " (" << __FILE__ << " #" << __LINE__ <<")" #else -#define SPDLOG_TRACE(logger, ...) +#define SPDLOG_TRACE(logger, ...) while(false) logger->trace() #endif #ifdef SPDLOG_DEBUG_ON -#define SPDLOG_DEBUG(logger, ...) logger->debug(__VA_ARGS__) << " (" << __FILE__ << " #" << __LINE__ <<")"; +#define SPDLOG_DEBUG(logger, ...) logger->debug(__VA_ARGS__) << " (" << __FILE__ << " #" << __LINE__ <<")" #else -#define SPDLOG_DEBUG(logger, ...) +#define SPDLOG_DEBUG(logger, ...) while(false) logger->debug() #endif From 92ca9a06afa1f7ef0a8a6db49e18ff43783b027c Mon Sep 17 00:00:00 2001 From: lethe555 Date: Tue, 23 Jun 2015 16:19:07 +0800 Subject: [PATCH 2/2] update SPDLOG_DEBUG --- include/spdlog/spdlog.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/spdlog/spdlog.h b/include/spdlog/spdlog.h index ab94bc96..372ebea4 100644 --- a/include/spdlog/spdlog.h +++ b/include/spdlog/spdlog.h @@ -138,15 +138,15 @@ void drop_all(); /////////////////////////////////////////////////////////////////////////////// #ifdef SPDLOG_TRACE_ON -#define SPDLOG_TRACE(logger, ...) logger->trace(__VA_ARGS__) << " (" << __FILE__ << " #" << __LINE__ <<")" +#define SPDLOG_TRACE(logger) (logger)->trace("[{}({})]:", __FILE__, __LINE__) #else -#define SPDLOG_TRACE(logger, ...) while(false) logger->trace() +#define SPDLOG_TRACE(logger) while(false) logger->trace() #endif #ifdef SPDLOG_DEBUG_ON -#define SPDLOG_DEBUG(logger, ...) logger->debug(__VA_ARGS__) << " (" << __FILE__ << " #" << __LINE__ <<")" +#define SPDLOG_DEBUG(logger) (logger)->debug("[{}({})]:", __FILE__, __LINE__) #else -#define SPDLOG_DEBUG(logger, ...) while(false) logger->debug() +#define SPDLOG_DEBUG(logger) while(false) logger->debug() #endif