From b42396340e309b1197058219bdb79395957877fc Mon Sep 17 00:00:00 2001 From: Benjamin Bannier Date: Mon, 23 Nov 2020 10:57:38 +0100 Subject: [PATCH] Find correct zeek namespace in debug logger macros. These macros forward to functionality in `zeek::detail::debug_logger` and are not intended for customization. This patch fixes the macros to always use `::zeek::detail::debug_logger` as without the leading `::` lookup could happen in any potentially local namespace `zeek` which does not need to provide this symbol. This closes zeek/spicy#597. --- src/DebugLogger.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/DebugLogger.h b/src/DebugLogger.h index f7c3a04e55..736ade5aac 100644 --- a/src/DebugLogger.h +++ b/src/DebugLogger.h @@ -12,15 +12,15 @@ #include #define DBG_LOG(stream, args...) \ - if ( zeek::detail::debug_logger.IsEnabled(stream) ) \ - zeek::detail::debug_logger.Log(stream, args) + if ( ::zeek::detail::debug_logger.IsEnabled(stream) ) \ + ::zeek::detail::debug_logger.Log(stream, args) #define DBG_LOG_VERBOSE(stream, args...) \ - if ( zeek::detail::debug_logger.IsVerbose() && zeek::detail::debug_logger.IsEnabled(stream) ) \ - zeek::detail::debug_logger.Log(stream, args) -#define DBG_PUSH(stream) zeek::detail::debug_logger.PushIndent(stream) -#define DBG_POP(stream) zeek::detail::debug_logger.PopIndent(stream) + if ( ::zeek::detail::debug_logger.IsVerbose() && ::zeek::detail::debug_logger.IsEnabled(stream) ) \ + ::zeek::detail::debug_logger.Log(stream, args) +#define DBG_PUSH(stream) ::zeek::detail::debug_logger.PushIndent(stream) +#define DBG_POP(stream) ::zeek::detail::debug_logger.PopIndent(stream) -#define PLUGIN_DBG_LOG(plugin, args...) zeek::detail::debug_logger.Log(plugin, args) +#define PLUGIN_DBG_LOG(plugin, args...) ::zeek::detail::debug_logger.Log(plugin, args) ZEEK_FORWARD_DECLARE_NAMESPACED(Plugin, zeek, plugin);