]>
Commit | Line | Data |
---|---|---|
de13a9ca JB |
1 | --- ZThread-2.3.2/src/MutexImpl.h.orig 2005-03-13 04:59:15.000000000 +0100 |
2 | +++ ZThread-2.3.2/src/MutexImpl.h 2008-09-10 18:19:39.448986470 +0200 | |
3 | @@ -153,7 +153,7 @@ void MutexImpl<List, Behavior>::acquire( | |
4 | ||
5 | _owner = self; | |
6 | ||
7 | - ownerAcquired(self); | |
8 | + Behavior::ownerAcquired(self); | |
9 | ||
10 | } | |
11 | ||
12 | @@ -164,7 +164,7 @@ void MutexImpl<List, Behavior>::acquire( | |
13 | _waiters.insert(self); | |
14 | m.acquire(); | |
15 | ||
16 | - waiterArrived(self); | |
17 | + Behavior::waiterArrived(self); | |
18 | ||
19 | { | |
20 | ||
21 | @@ -173,7 +173,7 @@ void MutexImpl<List, Behavior>::acquire( | |
22 | ||
23 | } | |
24 | ||
25 | - waiterDeparted(self); | |
26 | + Behavior::waiterDeparted(self); | |
27 | ||
28 | m.release(); | |
29 | ||
30 | @@ -192,7 +192,7 @@ void MutexImpl<List, Behavior>::acquire( | |
31 | assert(_owner == 0); | |
32 | _owner = self; | |
33 | ||
34 | - ownerAcquired(self); | |
35 | + Behavior::ownerAcquired(self); | |
36 | ||
37 | break; | |
38 | ||
39 | @@ -236,7 +236,7 @@ bool MutexImpl<List, Behavior>::tryAcqui | |
40 | ||
41 | _owner = self; | |
42 | ||
43 | - ownerAcquired(self); | |
44 | + Behavior::ownerAcquired(self); | |
45 | ||
46 | } | |
47 | ||
48 | @@ -253,7 +253,7 @@ bool MutexImpl<List, Behavior>::tryAcqui | |
49 | ||
50 | m.acquire(); | |
51 | ||
52 | - waiterArrived(self); | |
53 | + Behavior::waiterArrived(self); | |
54 | ||
55 | { | |
56 | ||
57 | @@ -262,7 +262,7 @@ bool MutexImpl<List, Behavior>::tryAcqui | |
58 | ||
59 | } | |
60 | ||
61 | - waiterDeparted(self); | |
62 | + Behavior::waiterDeparted(self); | |
63 | ||
64 | m.release(); | |
65 | ||
66 | @@ -284,7 +284,7 @@ bool MutexImpl<List, Behavior>::tryAcqui | |
67 | assert(0 == _owner); | |
68 | _owner = self; | |
69 | ||
70 | - ownerAcquired(self); | |
71 | + Behavior::ownerAcquired(self); | |
72 | ||
73 | break; | |
74 | ||
75 | @@ -326,7 +326,7 @@ void MutexImpl<List, Behavior>::release( | |
76 | ||
77 | _owner = 0; | |
78 | ||
79 | - ownerReleased(impl); | |
80 | + Behavior::ownerReleased(impl); | |
81 | ||
82 | // Try to find a waiter with a backoff & retry scheme | |
83 | for(;;) { | |
84 | --- ZThread-2.3.2/include/zthread/Guard.h.orig 2005-03-13 03:10:09.000000000 +0100 | |
85 | +++ ZThread-2.3.2/include/zthread/Guard.h 2008-09-10 18:14:58.176983956 +0200 | |
72fafc20 JB |
86 | @@ -428,7 +428,7 @@ |
87 | template <class U, class V> | |
88 | Guard(Guard<U, V>& g) : LockHolder<LockType>(g) { | |
89 | ||
90 | - LockingPolicy::shareScope(*this, extract(g)); | |
91 | + LockingPolicy::shareScope(*this, this->extract(g)); | |
92 | ||
93 | } | |
94 | ||
95 | @@ -458,7 +458,7 @@ | |
96 | template <class U, class V> | |
97 | Guard(Guard<U, V>& g, LockType& lock) : LockHolder<LockType>(lock) { | |
98 | ||
99 | - LockingPolicy::transferScope(*this, extract(g)); | |
100 | + LockingPolicy::transferScope(*this, this->extract(g)); | |
101 | ||
102 | } | |
103 | ||
de13a9ca JB |
104 | @@ -491,7 +491,7 @@ Guard<LockType, LockingPolicy>::~Guard() |
105 | ||
106 | try { | |
107 | ||
108 | - if(!isDisabled()) | |
109 | + if(!LockHolder<LockType>::isDisabled()) | |
110 | LockingPolicy::destroyScope(*this); | |
111 | ||
112 | } catch (...) { /* ignore */ } |