diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/llcommon/llskiplist.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/linden/indra/llcommon/llskiplist.h b/linden/indra/llcommon/llskiplist.h index be3385d..40d0c8a 100644 --- a/linden/indra/llcommon/llskiplist.h +++ b/linden/indra/llcommon/llskiplist.h | |||
@@ -28,11 +28,10 @@ | |||
28 | #ifndef LL_LLSKIPLIST_H | 28 | #ifndef LL_LLSKIPLIST_H |
29 | #define LL_LLSKIPLIST_H | 29 | #define LL_LLSKIPLIST_H |
30 | 30 | ||
31 | #include "llerror.h" | 31 | #include "llrand.h" |
32 | //#include "vmath.h" | ||
33 | 32 | ||
34 | // NOTA BENE: Insert first needs to be < NOT <= | 33 | // NOTA BENE: Insert first needs to be < NOT <= |
35 | 34 | // Binary depth must be >= 2 | |
36 | template <class DATA_TYPE, S32 BINARY_DEPTH = 10> | 35 | template <class DATA_TYPE, S32 BINARY_DEPTH = 10> |
37 | class LLSkipList | 36 | class LLSkipList |
38 | { | 37 | { |
@@ -144,14 +143,11 @@ private: | |||
144 | // Implementation | 143 | // Implementation |
145 | // | 144 | // |
146 | 145 | ||
146 | |||
147 | // Binary depth must be >= 2 | ||
147 | template <class DATA_TYPE, S32 BINARY_DEPTH> | 148 | template <class DATA_TYPE, S32 BINARY_DEPTH> |
148 | inline void LLSkipList<DATA_TYPE, BINARY_DEPTH>::init() | 149 | inline void LLSkipList<DATA_TYPE, BINARY_DEPTH>::init() |
149 | { | 150 | { |
150 | if (BINARY_DEPTH < 2) | ||
151 | { | ||
152 | llerrs << "Trying to create skip list with too little depth, " | ||
153 | "must be 2 or greater" << llendl; | ||
154 | } | ||
155 | S32 i; | 151 | S32 i; |
156 | for (i = 0; i < BINARY_DEPTH; i++) | 152 | for (i = 0; i < BINARY_DEPTH; i++) |
157 | { | 153 | { |