# HG changeset patch
# User Bruno Postle <bruno@postle.net>
# Date 1328910737 0
# Node ID c7ecd541dbd78bfa95dd495c7c4317bba81f4c3b
# Parent  658ded2153f2773a7e193f48d612d95104495080
Fixes for gcc-4.7.0

diff -r 658ded2153f2 -r c7ecd541dbd7 src/celeste/Utilities.h
--- a/src/celeste/Utilities.h	Sun Jan 01 13:23:39 2012 +0100
+++ b/src/celeste/Utilities.h	Fri Feb 10 21:52:17 2012 +0000
@@ -33,6 +33,8 @@
 #include <stdio.h>
 #ifdef _WINDOWS
 #include "direct.h"
+#else
+#include <unistd.h>
 #endif
 
 using namespace std; 
diff -r 658ded2153f2 -r c7ecd541dbd7 src/foreign/zthread/include/zthread/Guard.h
--- a/src/foreign/zthread/include/zthread/Guard.h	Sun Jan 01 13:23:39 2012 +0100
+++ b/src/foreign/zthread/include/zthread/Guard.h	Fri Feb 10 21:52:17 2012 +0000
@@ -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));
 
   }