blob: 7fbed48d9632d91f9f3ea40e5aa29abe41fbb02e (
plain)
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
|
--- trunk/src/raknet/BinarySearchTree.h 2012/08/18 23:13:49 954
+++ trunk/src/raknet/BinarySearchTree.h 2012/08/18 23:21:00 955
@@ -338,12 +338,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 )
{
@@ -371,7 +371,7 @@
if ( current == this->root )
break;
- current = find_parent( *( current->item ) );
+ current = this->find_parent( *( current->item ) );
}
}
@@ -400,7 +400,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>
@@ -409,7 +409,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>
@@ -446,8 +446,8 @@
*/
- B = find_parent( *( C->item ) );
- A = find_parent( *( B->item ) );
+ B = this->find_parent( *( C->item ) );
+ A = this->find_parent( *( B->item ) );
D = C->right;
if ( A )
@@ -510,8 +510,8 @@
*/
- B = find_parent( *( C->item ) );
- A = find_parent( *( B->item ) );
+ B = this->find_parent( *( C->item ) );
+ A = this->find_parent( *( B->item ) );
D = C->left;
if ( A )
|
