Merge pull request #2000

710b2e80 Silence clang++ warnings (Howard Chu)
This commit is contained in:
Riccardo Spagni 2017-05-05 11:26:38 +02:00
commit 28ecac2671
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD

View File

@ -290,7 +290,11 @@ ELPP_INTERNAL_DEBUGGING_OUT_INFO << ELPP_INTERNAL_DEBUGGING_MSG(internalInfoStre
#define ELPP_VARIADIC_TEMPLATES_SUPPORTED \ #define ELPP_VARIADIC_TEMPLATES_SUPPORTED \
(ELPP_COMPILER_GCC || ELPP_COMPILER_CLANG || ELPP_COMPILER_INTEL || (ELPP_COMPILER_MSVC && _MSC_VER >= 1800)) (ELPP_COMPILER_GCC || ELPP_COMPILER_CLANG || ELPP_COMPILER_INTEL || (ELPP_COMPILER_MSVC && _MSC_VER >= 1800))
// Logging Enable/Disable macros // 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)) #if (!defined(ELPP_DISABLE_DEBUG_LOGS) && (ELPP_LOGGING_ENABLED))
# define ELPP_DEBUG_LOG 1 # define ELPP_DEBUG_LOG 1
#else #else