mirror of
https://github.com/monero-project/monero.git
synced 2024-12-26 13:29:28 -05:00
Merge pull request #2900
5cc84693
easylogging: show the 'no stack trace' warning only once (ston1th)
This commit is contained in:
commit
f270382718
1
external/easylogging++/easylogging++.cc
vendored
1
external/easylogging++/easylogging++.cc
vendored
@ -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)
|
||||||
|
15
external/easylogging++/easylogging++.h
vendored
15
external/easylogging++/easylogging++.h
vendored
@ -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
|
||||||
|
Loading…
Reference in New Issue
Block a user