From 1b421d34ff4ecedd0fc4cc6ccd45fb408f98a779 Mon Sep 17 00:00:00 2001 From: Alexey Rybalchenko Date: Fri, 10 Jul 2020 13:56:17 +0200 Subject: [PATCH] Remove NDEBUG check --- CMakeLists.txt | 3 +-- README.md | 2 +- logger/Logger.h | 6 +----- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 519a52a..2bacf62 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -219,8 +219,7 @@ message(STATUS " ") if(DEFINED FAIR_MIN_SEVERITY) message(STATUS " ${Cyan}FAIR_MIN_SEVERITY${CR} ${BGreen}${FAIR_MIN_SEVERITY}${CR} (change with ${BMagenta}-DFAIR_MIN_SEVERITY=...${CR})") else() - message(STATUS " ${Cyan}FAIR_MIN_SEVERITY${CR} not defined${CR}, enabling all severities (starting with info if NDEBUG is defined)${CR}") - message(STATUS " (change with ${BMagenta}-DFAIR_MIN_SEVERITY=...${CR})") + message(STATUS " ${Cyan}FAIR_MIN_SEVERITY${CR} not defined${CR}, enabling all severities (change with ${BMagenta}-DFAIR_MIN_SEVERITY=...${CR})") endif() message(STATUS " ") message(STATUS " ${Cyan}INSTALL PREFIX${CR} ${BGreen}${CMAKE_INSTALL_PREFIX}${CR} (change with ${BMagenta}-DCMAKE_INSTALL_PREFIX=...${CR})") diff --git a/README.md b/README.md index 8ea0724..0677f44 100644 --- a/README.md +++ b/README.md @@ -111,7 +111,7 @@ The minimum severity level can be configured at compile time via definition of ` #include ``` -When `FAIR_MIN_SEVERITY` is not provided, it will be set to `info` if `NDEBUG` is defined, otherwise all severities will be enabled. +When `FAIR_MIN_SEVERITY` is not provided all severities are enabled. ## 4. Verbosity diff --git a/logger/Logger.h b/logger/Logger.h index b5b09af..24bee56 100644 --- a/logger/Logger.h +++ b/logger/Logger.h @@ -13,10 +13,6 @@ #warning "The symbol 'DEBUG' is used in FairRoot Logger. undefining..." #endif -#if !defined(FAIR_MIN_SEVERITY) && defined(NDEBUG) -#define FAIR_MIN_SEVERITY info -#endif - #ifdef FAIRLOGGER_USE_BOOST_PRETTY_FUNCTION #include #endif @@ -324,7 +320,7 @@ class Logger static bool fIsDestructed; static struct DestructionHelper { ~DestructionHelper() { Logger::fIsDestructed = true; }} fDestructionHelper; - static bool constexpr SuppressSeverity(Severity sev) + static bool constexpr SuppressSeverity(Severity sev __attribute__((unused))) { #ifdef FAIR_MIN_SEVERITY return sev < Severity::FAIR_MIN_SEVERITY;