diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-05-05 11:26:38 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-05-05 11:26:38 +0200 |
| commit | 28ecac26719f112980cc793a9d5607ece78633e1 (patch) | |
| tree | 469de47580141dc4d407c6c92fa04020d5faeeab | |
| parent | Merge pull request #1701 (diff) | |
| parent | Silence clang++ warnings (diff) | |
| download | monero-28ecac26719f112980cc793a9d5607ece78633e1.tar.xz | |
Merge pull request #2000
710b2e80 Silence clang++ warnings (Howard Chu)
| -rw-r--r-- | external/easylogging++/easylogging++.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/external/easylogging++/easylogging++.h b/external/easylogging++/easylogging++.h index 195df7e5c..8f592899e 100644 --- a/external/easylogging++/easylogging++.h +++ b/external/easylogging++/easylogging++.h @@ -290,7 +290,11 @@ ELPP_INTERNAL_DEBUGGING_OUT_INFO << ELPP_INTERNAL_DEBUGGING_MSG(internalInfoStre #define ELPP_VARIADIC_TEMPLATES_SUPPORTED \ (ELPP_COMPILER_GCC || ELPP_COMPILER_CLANG || ELPP_COMPILER_INTEL || (ELPP_COMPILER_MSVC && _MSC_VER >= 1800)) // Logging Enable/Disable macros -#define ELPP_LOGGING_ENABLED (!defined(ELPP_DISABLE_LOGS)) +#ifdef ELPP_DISABLE_LOGS +# define ELPP_LOGGING_ENABLED 0 +#else +# define ELPP_LOGGING_ENABLED 1 +#endif #if (!defined(ELPP_DISABLE_DEBUG_LOGS) && (ELPP_LOGGING_ENABLED)) # define ELPP_DEBUG_LOG 1 #else |