diff options
| author | Oz Linden <oz@lindenlab.com> | 2019-03-05 04:44:29 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2019-03-05 04:44:29 -0500 |
| commit | e86c0b3d0fbc5f91090241be959ef19bfffd8636 (patch) | |
| tree | 3e72f1f8f54facf84fb0f748fc4239a839780a81 /indra/llcommon/llerror.h | |
| parent | e409c0492f1b1ce63606c0b693c92cdb36dcc28b (diff) | |
fix error message reporting?
Diffstat (limited to 'indra/llcommon/llerror.h')
| -rw-r--r-- | indra/llcommon/llerror.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/llcommon/llerror.h b/indra/llcommon/llerror.h index 07aa5c6f8b..2a73ccb36a 100644 --- a/indra/llcommon/llerror.h +++ b/indra/llcommon/llerror.h @@ -194,6 +194,8 @@ namespace LLError struct CallSite; + enum ErrCrashHandlerResult { ERR_DO_NOT_CRASH, ERR_CRASH }; + class LL_COMMON_API Log { public: @@ -203,7 +205,7 @@ namespace LLError static void flush(std::ostringstream* out, char* message); // returns false iff the calling macro should crash - static bool flush(std::ostringstream*, const CallSite&); + static ErrCrashHandlerResult flush(std::ostringstream*, const CallSite&); static std::string demangle(const char* mangled); }; @@ -386,7 +388,7 @@ volatile extern int* gCauseCrash; #define LL_ENDL \ LLError::End(); \ - if (LLError::Log::flush(_out, _site)) \ + if (LLError::ERR_CRASH == LLError::Log::flush(_out, _site)) \ LLERROR_CRASH \ } \ } while(0) |