diff options
| author | Perttu Ahola <celeron55@gmail.com> | 2011-10-16 14:57:53 +0300 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2011-10-16 14:57:53 +0300 |
| commit | b65a5aceb0d6552d8ba4878bed5326c614dd3046 (patch) | |
| tree | 088aa083f65c8d738609e3061f8400847c7fb2b0 /src/debug.h | |
| parent | 4846846a2d28e06f347cb46ffe6be2a42337eb32 (diff) | |
| download | minetest-b65a5aceb0d6552d8ba4878bed5326c614dd3046.tar.gz minetest-b65a5aceb0d6552d8ba4878bed5326c614dd3046.tar.bz2 minetest-b65a5aceb0d6552d8ba4878bed5326c614dd3046.zip | |
Use the logger; also, default to not showing much crap in console. Use --info-on-stderr to enable crap.
Diffstat (limited to 'src/debug.h')
| -rw-r--r-- | src/debug.h | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/src/debug.h b/src/debug.h index f3cfe88b3..98fe6e129 100644 --- a/src/debug.h +++ b/src/debug.h @@ -235,10 +235,9 @@ private: #if CATCH_UNHANDLED_EXCEPTIONS == 1 #define BEGIN_PORTABLE_DEBUG_EXCEPTION_HANDLER try{ - #define END_PORTABLE_DEBUG_EXCEPTION_HANDLER\ + #define END_PORTABLE_DEBUG_EXCEPTION_HANDLER(logstream)\ }catch(std::exception &e){\ - dstream<<std::endl<<DTIME\ - <<"ERROR: An unhandled exception occurred: "\ + logstream<<"ERROR: An unhandled exception occurred: "\ <<e.what()<<std::endl;\ assert(0);\ } @@ -257,24 +256,24 @@ public: BEGIN_PORTABLE_DEBUG_EXCEPTION_HANDLER\ _set_se_translator(se_trans_func); - #define END_DEBUG_EXCEPTION_HANDLER \ - END_PORTABLE_DEBUG_EXCEPTION_HANDLER + #define END_DEBUG_EXCEPTION_HANDLER(logstream) \ + END_PORTABLE_DEBUG_EXCEPTION_HANDLER(logstream) #else // Probably mingw #define BEGIN_DEBUG_EXCEPTION_HANDLER\ BEGIN_PORTABLE_DEBUG_EXCEPTION_HANDLER - #define END_DEBUG_EXCEPTION_HANDLER\ - END_PORTABLE_DEBUG_EXCEPTION_HANDLER + #define END_DEBUG_EXCEPTION_HANDLER(logstream)\ + END_PORTABLE_DEBUG_EXCEPTION_HANDLER(logstream) #endif #else // Posix #define BEGIN_DEBUG_EXCEPTION_HANDLER\ BEGIN_PORTABLE_DEBUG_EXCEPTION_HANDLER - #define END_DEBUG_EXCEPTION_HANDLER\ - END_PORTABLE_DEBUG_EXCEPTION_HANDLER + #define END_DEBUG_EXCEPTION_HANDLER(logstream)\ + END_PORTABLE_DEBUG_EXCEPTION_HANDLER(logstream) #endif #else // Dummy ones #define BEGIN_DEBUG_EXCEPTION_HANDLER - #define END_DEBUG_EXCEPTION_HANDLER + #define END_DEBUG_EXCEPTION_HANDLER(logstream) #endif #endif // DEBUG_HEADER |