Changeset 3562 for trunk/kStuff/include/k/kAvloU32.h

Timestamp:

Aug 27, 2007, 12:31:38 AM (18 years ago)

Author:

bird

Message:

Made is possible to redefine the AVLNODE members, thus allowing a structure to be used by more than one kAvl instance (i.e. be in more than one tree). Define the callback and enumdata our selves.

File:

• trunk/kStuff/include/k/kAvloU32.h (modified) (2 diffs)

trunk/kStuff/include/k/kAvloU32.h

@@ -28 +28 @@
 #define ___k_kAvloU32_h___
 
-typedef KU32 KAVLOU32PTR;
+typedef KI32 KAVLOU32PTR;
 
 typedef struct KAVLOU32
 {
-    KU32                Key;
-    KU8                 uchHeight;
-    KAVLOU32PTR         pLeft;
-    KAVLOU32PTR         pRight;
+    KU32                u32;
+    KU8                 cFloorsToGo;
+    KAVLOU32PTR         offLeft;
+    KAVLOU32PTR         offRight;
 } KAVLOU32, *PKAVLOU32, **PPKAVLOU32;
 
-typedef struct
-{
-    KBOOL               fFromLeft;
-    KI8                 cEntries;
-    KU8                 achFlags[32];
-    PKAVLOU32           aEntries[32];
-} KAVLOU32ENUMDATA, *PKAVLOU32ENUMDATA;
-
-typedef int (* PFNKAVLOU32CALLBACK)(KAVLOU32 *, void *);
+#define mKey                    u32
+#define mHeight                 cFloorsToGo
+#define mpLeft                  offLeft
+#define mpRight                 offRight
 
 /*#define KAVL_EQUAL_ALLOWED*/
@@ -56 +51 @@
 #define KAVLKEY                 KU32
 #define KAVLTREEPTR             KAVLOU32PTR
-#define KAVLNODECORE            KAVLOU32
+#define KAVLNODE                KAVLOU32
 #define KAVL_FN(name)           kAvloU32 ## name
 #define KAVL_TYPE(prefix,name)  prefix ## KAVLOU32 ## name