1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
|
$NetBSD: patch-am,v 1.3 2011/11/27 19:36:09 joerg Exp $
--- ../spunk/coll.h.orig 1996-12-18 23:42:14.000000000 +0000
+++ ../spunk/coll.h
@@ -24,7 +24,7 @@
#include <stdlib.h>
-#include <iostream.h>
+#include <iostream>
#include "check.h"
#include "object.h"
@@ -33,8 +33,8 @@
-static const coIndexError = 1; // Index out of range
-static const coOverflowError = 2; // Collection overflow
+static const int coIndexError = 1; // Index out of range
+static const int coOverflowError = 2; // Collection overflow
@@ -479,15 +479,15 @@ int SortedCollection<T, U>::IndexOf (con
// Duplicates allowed. Do a linear search.
// (Hint: Search returns the first of all entrys with the same key)
- Item2 = (T*) Items [Index];
+ Item2 = (T*) this->Items [Index];
do {
if (Item2 == Item) {
// That's it !
return Index;
}
// Get next
- Item2 = (T*) Items [++Index];
- } while (Index < Count && Compare (Key, KeyOf (Item2)) == 0);
+ Item2 = (T*) this->Items [++Index];
+ } while (Index < this->Count && Compare (Key, KeyOf (Item2)) == 0);
// Item not found
return -1;
@@ -522,7 +522,7 @@ int SortedCollection<T, U>::Search (cons
{
// do a binary search
int First = 0;
- int Last = Count - 1;
+ int Last = this->Count - 1;
int Current;
int Result;
int S = 0;
@@ -533,7 +533,7 @@ int SortedCollection<T, U>::Search (cons
Current = (Last + First) / 2;
// Do a compare
- Result = Compare (KeyOf ((T*) Items [Current]), Key);
+ Result = Compare (KeyOf ((T*) this->Items [Current]), Key);
if (Result < 0) {
First = Current + 1;
} else {
@@ -577,7 +577,7 @@ T* SortedCollection<T, U>::Find (const U
int I;
if (Search (Key, I) != 0) {
// We found the key, I is the index
- return At (I);
+ return this->At (I);
} else {
// We did not find the key
return 0;
|
