Line 0
Link Here
|
|
|
1 |
--- src/Lib/ArrayUtil/QueueTemplate.hpp.orig Sun Dec 21 01:48:03 2003 |
2 |
+++ src/Lib/ArrayUtil/QueueTemplate.hpp Thu Aug 19 16:34:31 2004 |
3 |
@@ -42,8 +42,8 @@ |
4 |
|
5 |
bool enqueue(const TYPE& object ) |
6 |
{ |
7 |
- add( object, (rear + 1) % size ); |
8 |
- rear = (rear + 1) % size; |
9 |
+ add( object, (rear + 1) % this->size ); |
10 |
+ rear = (rear + 1) % this->size; |
11 |
|
12 |
if ( front == rear ) |
13 |
return( false ); |
14 |
@@ -55,29 +55,29 @@ |
15 |
{ |
16 |
assert( front != rear ); |
17 |
|
18 |
- front = ( front + 1 ) % size; |
19 |
- return( array[ front ] ); |
20 |
+ front = ( front + 1 ) % this->size; |
21 |
+ return( this->array[ front ] ); |
22 |
} |
23 |
|
24 |
void pop() |
25 |
{ |
26 |
assert( front != rear ); |
27 |
|
28 |
- front = ( front + 1 ) % size; |
29 |
+ front = ( front + 1 ) % this->size; |
30 |
} |
31 |
|
32 |
TYPE getFirst() |
33 |
{ |
34 |
assert( front != rear ); |
35 |
|
36 |
- return( array[ (( front + 1 ) % size) ] ); |
37 |
+ return( this->array[ (( front + 1 ) % this->size) ] ); |
38 |
} |
39 |
|
40 |
TYPE * getFirstPtr() |
41 |
{ |
42 |
assert( front != rear ); |
43 |
|
44 |
- return( &(array[ (( front + 1 ) % size) ]) ); |
45 |
+ return( &(this->array[ (( front + 1 ) % this->size) ]) ); |
46 |
} |
47 |
|
48 |
|
49 |
@@ -88,7 +88,7 @@ |
50 |
|
51 |
bool isFull () const |
52 |
{ |
53 |
- return front == (rear + 1) % size; |
54 |
+ return front == (rear + 1) % this->size; |
55 |
} |
56 |
|
57 |
bool isReady() const |
58 |
@@ -99,7 +99,7 @@ |
59 |
unsigned long itemCount() const |
60 |
{ |
61 |
if ( front > rear ) |
62 |
- return ( (rear+1) + ( (size-1) - front ) ); |
63 |
+ return ( (rear+1) + ( (this->size-1) - front ) ); |
64 |
else |
65 |
return ( rear - front ); |
66 |
} |