diff options
| author | Callum Prentice <callum@lindenlab.com> | 2010-02-04 17:03:41 -0800 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2010-02-04 17:03:41 -0800 |
| commit | 259fa5fd0b67459145eb5463d79f37271ee7af0a (patch) | |
| tree | 27c7eaddb0c6f7dd406228e3a61fc89b6fedb159 /indra/llcommon/llerrorlegacy.h | |
| parent | 80139d95adbcb2258c5541a4e0ace32f32b78ba5 (diff) | |
| parent | a4aed31ad9fd1874b134af87145ec93b283dbbfb (diff) | |
Merge with tip
Diffstat (limited to 'indra/llcommon/llerrorlegacy.h')
| -rw-r--r-- | indra/llcommon/llerrorlegacy.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/llcommon/llerrorlegacy.h b/indra/llcommon/llerrorlegacy.h index 7a970b1466..476d75380f 100644 --- a/indra/llcommon/llerrorlegacy.h +++ b/indra/llcommon/llerrorlegacy.h @@ -34,7 +34,7 @@ #ifndef LL_LLERRORLEGACY_H #define LL_LLERRORLEGACY_H - +#include "llpreprocessor.h" /* LEGACY -- DO NOT USE THIS STUFF ANYMORE @@ -75,6 +75,10 @@ const int LL_ERR_PRICE_MISMATCH = -23018; #define SHOW_ASSERT #else // _DEBUG +#ifdef LL_RELEASE_WITH_DEBUG_INFO +#define SHOW_ASSERT +#endif // LL_RELEASE_WITH_DEBUG_INFO + #ifdef RELEASE_SHOW_DEBUG #define SHOW_DEBUG #endif @@ -103,7 +107,7 @@ const int LL_ERR_PRICE_MISMATCH = -23018; #define llwarning(msg, num) llwarns << "Warning # " << num << ": " << msg << llendl; -#define llassert_always(func) if (!(func)) llerrs << "ASSERT (" << #func << ")" << llendl; +#define llassert_always(func) if (LL_UNLIKELY(!(func))) llerrs << "ASSERT (" << #func << ")" << llendl; #ifdef SHOW_ASSERT #define llassert(func) llassert_always(func) |