diff options
author | Richard Linden <none@none> | 2012-12-06 14:30:56 -0800 |
---|---|---|
committer | Richard Linden <none@none> | 2012-12-06 14:30:56 -0800 |
commit | 2facd6374517d88f03e3f06b1ccc02565da26b45 (patch) | |
tree | 31798086db55cd9fd1c266a3d5fe12cfc46a9dfc /indra/llcommon/llskipmap.h | |
parent | 60800dacdd7e9b66ed654af471f2b9e9680cd981 (diff) |
SH-3406 WIP convert fast timers to lltrace system
improved LLUnit compile time errors
removed cassert in favor of llstatic_assert
Diffstat (limited to 'indra/llcommon/llskipmap.h')
-rw-r--r-- | indra/llcommon/llskipmap.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/indra/llcommon/llskipmap.h b/indra/llcommon/llskipmap.h index 49ff2928d1..ed53973baa 100644 --- a/indra/llcommon/llskipmap.h +++ b/indra/llcommon/llskipmap.h @@ -210,8 +210,7 @@ inline LLSkipMap<INDEX_TYPE, DATA_TYPE, BINARY_DEPTH>::LLSkipMap() : mInsertFirst(NULL), mEquals(defaultEquals) { - // Skipmaps must have binary depth of at least 2 - cassert(BINARY_DEPTH >= 2); + llstatic_assert(BINARY_DEPTH >= 2, "Skipmaps must have binary depth of at least 2"); S32 i; for (i = 0; i < BINARY_DEPTH; i++) @@ -229,8 +228,7 @@ inline LLSkipMap<INDEX_TYPE, DATA_TYPE, BINARY_DEPTH>::LLSkipMap(BOOL (*insert_f : mInsertFirst(insert_first), mEquals(equals) { - // Skipmaps must have binary depth of at least 2 - cassert(BINARY_DEPTH >= 2); + llstatic_assert(BINARY_DEPTH >= 2, "Skipmaps must have binary depth of at least 2"); mLevel = 1; S32 i; |