From 2dc83000f642298a849fe966a180a0c8ee240835 Mon Sep 17 00:00:00 2001
From: Steve Wills <swills@FreeBSD.org>
Date: Wed, 3 Oct 2012 15:01:55 +0000
Subject: - Fix build with clang - Switch to SF mirror - Add USE_DOS2UNIX

PR:		ports/171859
Approved by:	Iouri Ivliev <ii@any.com.ru> (maintainer)
---
 .../files/patch-zthread-include-zthread-Guard.h    | 43 ++++++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 graphics/panomatic/files/patch-zthread-include-zthread-Guard.h

(limited to 'graphics/panomatic/files/patch-zthread-include-zthread-Guard.h')

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));
+ 
+   }
+ 
-- 
cgit v1.2.3