mirror of
https://git.freebsd.org/ports.git
synced 2025-06-06 05:10:29 -04:00
38 lines
1.1 KiB
C++
38 lines
1.1 KiB
C++
--- include/zthread/Guard.h.orig 2005-03-13 02:10:09 UTC
|
|
+++ include/zthread/Guard.h
|
|
@@ -108,7 +108,7 @@ class CompoundScope {
|
|
}
|
|
|
|
template <class LockType>
|
|
- static void createScope(LockHolder<LockType>& l, unsigned long ms) {
|
|
+ static bool createScope(LockHolder<LockType>& l, unsigned long ms) {
|
|
|
|
if(Scope1::createScope(l, ms))
|
|
if(!Scope2::createScope(l, ms)) {
|
|
@@ -428,7 +428,7 @@ public:
|
|
template <class U, class V>
|
|
Guard(Guard<U, V>& g) : LockHolder<LockType>(g) {
|
|
|
|
- LockingPolicy::shareScope(*this, extract(g));
|
|
+ LockingPolicy::shareScope(*this, this->extract(g));
|
|
|
|
}
|
|
|
|
@@ -458,7 +458,7 @@ public:
|
|
template <class U, class V>
|
|
Guard(Guard<U, V>& g, LockType& lock) : LockHolder<LockType>(lock) {
|
|
|
|
- LockingPolicy::transferScope(*this, extract(g));
|
|
+ LockingPolicy::transferScope(*this, this->extract(g));
|
|
|
|
}
|
|
|
|
@@ -491,7 +491,7 @@ Guard<LockType, LockingPolicy>::~Guard()
|
|
|
|
try {
|
|
|
|
- if(!isDisabled())
|
|
+ if(!this->isDisabled())
|
|
LockingPolicy::destroyScope(*this);
|
|
|
|
} catch (...) { /* ignore */ }
|