diff options
| author | James Cook <james@lindenlab.com> | 2007-07-02 23:52:40 +0000 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2007-07-02 23:52:40 +0000 |
| commit | 1a33bc19b4ce94ab210749911dff14409b4454dd (patch) | |
| tree | b674d97d37240a29c0a6671adfe950a506ef0ea4 /indra/llcommon/llskiplist.h | |
| parent | e5124431b54d4342d4677371fccca5bc7250c079 (diff) | |
svn merge -r 62595:62596 and 62598:63308 sse-skinning-3 for faster software avatar rendering. Visual Studio 2005 project file fixed pending.
Diffstat (limited to 'indra/llcommon/llskiplist.h')
| -rw-r--r-- | indra/llcommon/llskiplist.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/indra/llcommon/llskiplist.h b/indra/llcommon/llskiplist.h index ed1aa1f0aa..4676fb8f18 100644 --- a/indra/llcommon/llskiplist.h +++ b/indra/llcommon/llskiplist.h @@ -8,11 +8,10 @@ #ifndef LL_LLSKIPLIST_H #define LL_LLSKIPLIST_H -#include "llerror.h" -//#include "vmath.h" +#include "llrand.h" // NOTA BENE: Insert first needs to be < NOT <= - +// Binary depth must be >= 2 template <class DATA_TYPE, S32 BINARY_DEPTH = 10> class LLSkipList { @@ -124,14 +123,11 @@ private: // Implementation // + +// Binary depth must be >= 2 template <class DATA_TYPE, S32 BINARY_DEPTH> inline void LLSkipList<DATA_TYPE, BINARY_DEPTH>::init() { - if (BINARY_DEPTH < 2) - { - llerrs << "Trying to create skip list with too little depth, " - "must be 2 or greater" << llendl; - } S32 i; for (i = 0; i < BINARY_DEPTH; i++) { |