Merge pull request #2900

5cc84693 easylogging: show the 'no stack trace' warning only once (ston1th)
This commit is contained in:
Riccardo Spagni 2017-12-10 12:57:23 +02:00
commit f270382718
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
2 changed files with 9 additions and 7 deletions

View File

@ -14,6 +14,7 @@
// http://muflihun.com // http://muflihun.com
// //
#define EASYLOGGING_CC
#include "easylogging++.h" #include "easylogging++.h"
#if defined(AUTO_INITIALIZE_EASYLOGGINGPP) #if defined(AUTO_INITIALIZE_EASYLOGGINGPP)

View File

@ -203,16 +203,17 @@ ELPP_INTERNAL_DEBUGGING_OUT_INFO << ELPP_INTERNAL_DEBUGGING_MSG(internalInfoStre
# if (ELPP_COMPILER_GCC && !ELPP_MINGW && !ELPP_OS_OPENBSD) # if (ELPP_COMPILER_GCC && !ELPP_MINGW && !ELPP_OS_OPENBSD)
# define ELPP_STACKTRACE 1 # define ELPP_STACKTRACE 1
# else # else
# define ELPP_STACKTRACE 0
# if ELPP_COMPILER_MSVC
# pragma message("Stack trace not available for this compiler")
# else
# warning "Stack trace not available for this compiler";
# endif // ELPP_COMPILER_MSVC
# define ELPP_STACKTRACE 0 # define ELPP_STACKTRACE 0
# ifdef EASYLOGGING_CC
# if ELPP_COMPILER_MSVC
# pragma message("Stack trace not available for this compiler")
# else
# warning "Stack trace not available for this compiler";
# endif // ELPP_COMPILER_MSVC
# endif
# endif // ELPP_COMPILER_GCC # endif // ELPP_COMPILER_GCC
#else #else
# define ELPP_STACKTRACE 0 # define ELPP_STACKTRACE 0
#endif // (defined(ELPP_FEATURE_ALL)) || (defined(ELPP_FEATURE_CRASH_LOG)) #endif // (defined(ELPP_FEATURE_ALL)) || (defined(ELPP_FEATURE_CRASH_LOG))
// Miscellaneous macros // Miscellaneous macros
#define ELPP_UNUSED(x) (void)x #define ELPP_UNUSED(x) (void)x