diff options
| author | Mike Antipov <mantipov@productengine.com> | 2010-01-26 09:36:40 +0200 |
|---|---|---|
| committer | Mike Antipov <mantipov@productengine.com> | 2010-01-26 09:36:40 +0200 |
| commit | 04729c1cd581e985247e5537fdcd46d78e5a9f1c (patch) | |
| tree | c8368ccb8e00e6128c9ef453a7f106ef433d0abc /indra/llcommon/llerrorlegacy.h | |
| parent | 5d7497aab21f9cfcd8b86c73c27dce33e8409841 (diff) | |
| parent | fbf605ea321ee29afad63a4afe47f65584d67eea (diff) | |
Merge with default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/llcommon/llerrorlegacy.h')
| -rw-r--r-- | indra/llcommon/llerrorlegacy.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcommon/llerrorlegacy.h b/indra/llcommon/llerrorlegacy.h index 9920921a58..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 @@ -107,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) |