diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-12-10 12:57:23 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-12-10 12:57:23 +0200 |
| commit | f27038271860ec878258761309c5ffdc10c20ee9 (patch) | |
| tree | dbaf573bb1538515b04c7e8bb22e791ccf68ee55 | |
| parent | Merge pull request #2904 (diff) | |
| parent | easylogging: show the 'no stack trace' warning only once (diff) | |
| download | monero-f27038271860ec878258761309c5ffdc10c20ee9.tar.xz | |
Merge pull request #2900
5cc84693 easylogging: show the 'no stack trace' warning only once (ston1th)
| -rw-r--r-- | external/easylogging++/easylogging++.cc | 1 | ||||
| -rw-r--r-- | external/easylogging++/easylogging++.h | 11 |
2 files changed, 7 insertions, 5 deletions
diff --git a/external/easylogging++/easylogging++.cc b/external/easylogging++/easylogging++.cc index 6bc6b2619..31b201897 100644 --- a/external/easylogging++/easylogging++.cc +++ b/external/easylogging++/easylogging++.cc @@ -14,6 +14,7 @@ // http://muflihun.com // +#define EASYLOGGING_CC #include "easylogging++.h" #if defined(AUTO_INITIALIZE_EASYLOGGINGPP) diff --git a/external/easylogging++/easylogging++.h b/external/easylogging++/easylogging++.h index 469cf9eec..3270bd607 100644 --- a/external/easylogging++/easylogging++.h +++ b/external/easylogging++/easylogging++.h @@ -203,16 +203,17 @@ ELPP_INTERNAL_DEBUGGING_OUT_INFO << ELPP_INTERNAL_DEBUGGING_MSG(internalInfoStre # if (ELPP_COMPILER_GCC && !ELPP_MINGW && !ELPP_OS_OPENBSD) # define ELPP_STACKTRACE 1 # else -# define ELPP_STACKTRACE 0 +# define ELPP_STACKTRACE 0 +# ifdef EASYLOGGING_CC # if ELPP_COMPILER_MSVC -# pragma message("Stack trace not available for this compiler") +# pragma message("Stack trace not available for this compiler") # else -# warning "Stack trace not available for this compiler"; +# warning "Stack trace not available for this compiler"; # endif // ELPP_COMPILER_MSVC -# define ELPP_STACKTRACE 0 +# endif # endif // ELPP_COMPILER_GCC #else -# define ELPP_STACKTRACE 0 +# define ELPP_STACKTRACE 0 #endif // (defined(ELPP_FEATURE_ALL)) || (defined(ELPP_FEATURE_CRASH_LOG)) // Miscellaneous macros #define ELPP_UNUSED(x) (void)x |