diff options
| author | Steve Wills <swills@FreeBSD.org> | 2012-10-03 15:01:55 +0000 |
|---|---|---|
| committer | Steve Wills <swills@FreeBSD.org> | 2012-10-03 15:01:55 +0000 |
| commit | 2dc83000f642298a849fe966a180a0c8ee240835 (patch) | |
| tree | db3990209c5445a0fb715f0597231295c512aa73 /graphics/panomatic/files/patch-zthread-include-zthread-Guard.h | |
| parent | - Update to 2012.09.27. (diff) | |
- Fix build with clang
- Switch to SF mirror
- Add USE_DOS2UNIX
PR: ports/171859
Approved by: Iouri Ivliev <ii@any.com.ru> (maintainer)
Diffstat (limited to 'graphics/panomatic/files/patch-zthread-include-zthread-Guard.h')
| -rw-r--r-- | graphics/panomatic/files/patch-zthread-include-zthread-Guard.h | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/graphics/panomatic/files/patch-zthread-include-zthread-Guard.h b/graphics/panomatic/files/patch-zthread-include-zthread-Guard.h new file mode 100644 index 000000000000..d9090a77ce5e --- /dev/null +++ b/graphics/panomatic/files/patch-zthread-include-zthread-Guard.h @@ -0,0 +1,43 @@ +--- zthread/include/zthread/Guard.h.orig 2008-02-28 23:15:33.000000000 +0000 ++++ zthread/include/zthread/Guard.h 2012-09-24 12:02:46.539117586 +0000 +@@ -58,7 +58,7 @@ + public: + + template <class T> +- LockHolder(T& t) : _lock(extract(t)._lock), _enabled(true) { } ++ LockHolder(T& t) : _lock(this->extract(t)._lock), _enabled(true) { } + + LockHolder(LockHolder& holder) : _lock(holder._lock), _enabled(true) { } + +@@ -114,11 +114,11 @@ + if(!Scope2::createScope(l, ms)) { + + Scope1::destroyScope(l); +- return false; ++ return; + + } + +- return true; ++ return; + + } + +@@ -428,7 +428,7 @@ + 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 @@ + 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)); + + } + |