diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-02-11 00:21:31 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-02-11 00:21:31 +0200 |
| commit | 003a51d3994e0d59243c34f576b3118334f4e53c (patch) | |
| tree | e8c8aefa818cedad9b62cb7963d7c6c492f10f0e | |
| parent | 4feaa790e273cb4db1339df8e065d86130638a33 (diff) | |
| parent | 1c782a923d4095695600ab1d04904d5102a21f15 (diff) | |
| download | monzero-core-003a51d3994e0d59243c34f576b3118334f4e53c.tar.gz monzero-core-003a51d3994e0d59243c34f576b3118334f4e53c.tar.xz monzero-core-003a51d3994e0d59243c34f576b3118334f4e53c.zip | |
Merge pull request #1682
1c782a92 easylogging++: do not disable DEBUG level based on _DEBUG/NDEBUG (moneromooo-monero)
| -rw-r--r-- | external/easylogging++/easylogging++.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/external/easylogging++/easylogging++.h b/external/easylogging++/easylogging++.h index d28152667..3b58c0fec 100644 --- a/external/easylogging++/easylogging++.h +++ b/external/easylogging++/easylogging++.h @@ -281,11 +281,11 @@ ELPP_INTERNAL_DEBUGGING_OUT_INFO << ELPP_INTERNAL_DEBUGGING_MSG(internalInfoStre (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)) -#if (!defined(ELPP_DISABLE_DEBUG_LOGS) && (ELPP_LOGGING_ENABLED) && ((defined(_DEBUG)) || (!defined(NDEBUG)))) +#if (!defined(ELPP_DISABLE_DEBUG_LOGS) && (ELPP_LOGGING_ENABLED)) # define ELPP_DEBUG_LOG 1 #else # define ELPP_DEBUG_LOG 0 -#endif // (!defined(ELPP_DISABLE_DEBUG_LOGS) && (ELPP_LOGGING_ENABLED) && ((defined(_DEBUG)) || (!defined(NDEBUG)))) +#endif // (!defined(ELPP_DISABLE_DEBUG_LOGS) && (ELPP_LOGGING_ENABLED)) #if (!defined(ELPP_DISABLE_INFO_LOGS) && (ELPP_LOGGING_ENABLED)) # define ELPP_INFO_LOG 1 #else |