From: <hug...@li...> - 2013-02-28 10:24:45
|
branch: mosaicMode details: http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgroot/hugin/hugin/rev/4e44a5d4028a changeset: 6178:4e44a5d4028a user: td...@ii... date: Thu Feb 28 12:40:09 2013 +1100 description: Fixes build errors with GCC 4.7.2 diffstat: src/celeste/Utilities.cpp | 4 ++-- src/foreign/zthread/include/zthread/Guard.h | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diffs (58 lines): diff -r 99b81be288c7 -r 4e44a5d4028a src/celeste/Utilities.cpp --- a/src/celeste/Utilities.cpp Thu Feb 21 15:30:42 2013 -0600 +++ b/src/celeste/Utilities.cpp Thu Feb 28 12:40:09 2013 +1100 @@ -28,7 +28,7 @@ #include <math.h> #include <stdlib.h> #include "Utilities.h" - +#include <unistd.h> /* TLD 28/02/2013 */ using namespace std; namespace celeste @@ -285,4 +285,4 @@ else return val; } -}; // namespace \ No newline at end of file +}; // namespace diff -r 99b81be288c7 -r 4e44a5d4028a src/foreign/zthread/include/zthread/Guard.h --- a/src/foreign/zthread/include/zthread/Guard.h Thu Feb 21 15:30:42 2013 -0600 +++ b/src/foreign/zthread/include/zthread/Guard.h Thu Feb 28 12:40:09 2013 +1100 @@ -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)); } @@ -442,7 +442,7 @@ */ Guard(Guard& g) : LockHolder<LockType>(g) { - LockingPolicy::shareScope(*this, g); + LockingPolicy::shareScope(*this, this->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)); } @@ -473,7 +473,7 @@ */ Guard(Guard& g, LockType& lock) : LockHolder<LockType>(lock) { - LockingPolicy::transferScope(*this, g); + LockingPolicy::transferScope(*this, this->g); } |