blob: 212095f1cf84a985b98f536891b48755af7e9039 (
plain) (
blame)
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
|
--- Source/DS_BinarySearchTree.h.orig 2013-11-15 22:00:44.000000000 +0100
+++ Source/DS_BinarySearchTree.h 2013-11-15 22:02:47.000000000 +0100
@@ -166,12 +166,12 @@
if ( current->left == 0 )
left_height = 0;
else
- left_height = Height( current->left );
+ left_height = this->Height( current->left );
if ( current->right == 0 )
right_height = 0;
else
- right_height = Height( current->right );
+ right_height = this->Height( current->right );
if ( right_height - left_height == 2 )
{
@@ -199,7 +199,7 @@
if ( current == this->root )
break;
- current = FindParent( *( current->item ) );
+ current = this->FindParent( *( current->item ) );
}
}
@@ -226,7 +226,7 @@
if ( A == 0 )
return false;
- return Height( A->right ) > Height( A->left );
+ return this->Height( A->right ) > this->Height( A->left );
}
template <class BinarySearchTreeType>
@@ -235,7 +235,7 @@
if ( A == 0 )
return false;
- return Height( A->left ) > Height( A->right );
+ return this->Height( A->left ) > this->Height( A->right );
}
template <class BinarySearchTreeType>
@@ -272,8 +272,8 @@
*/
- B = FindParent( *( C->item ) );
- A = FindParent( *( B->item ) );
+ B = this->FindParent( *( C->item ) );
+ A = this->FindParent( *( B->item ) );
D = C->right;
if ( A )
@@ -336,8 +336,8 @@
*/
- B = FindParent( *( C->item ) );
- A = FindParent( *( B->item ) );
+ B = this->FindParent( *( C->item ) );
+ A = this->FindParent( *( B->item ) );
D = C->left;
if ( A )
|
