diff options
| author | joerg <joerg> | 2012-11-16 00:53:01 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2012-11-16 00:53:01 +0000 |
| commit | 79380601919e0f363d54431e008e75f6a4a8b62c (patch) | |
| tree | cd1ecfa0ab090bdc0fe45d8e0d6d40130ec7ca71 /graphics/panomatic | |
| parent | 5be89d62ebb29875038d975319e30a464d708614 (diff) | |
| download | pkgsrc-79380601919e0f363d54431e008e75f6a4a8b62c.tar.gz | |
Match return type and return use. Fix template look up.
Diffstat (limited to 'graphics/panomatic')
| -rw-r--r-- | graphics/panomatic/distinfo | 3 | ||||
| -rw-r--r-- | graphics/panomatic/patches/patch-zthread_include_zthread_Guard.h | 22 |
2 files changed, 24 insertions, 1 deletions
diff --git a/graphics/panomatic/distinfo b/graphics/panomatic/distinfo index 34221b2c5dc..05c0b8c9afe 100644 --- a/graphics/panomatic/distinfo +++ b/graphics/panomatic/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2012/08/07 16:44:50 marino Exp $ +$NetBSD: distinfo,v 1.5 2012/11/16 00:53:01 joerg Exp $ SHA1 (panomatic-0.9.4-src.tar.bz2) = cc0a48d81d090ec90e134afba4b9e700a5843f09 RMD160 (panomatic-0.9.4-src.tar.bz2) = 14ad37420733f950b8f7640c2e7f0b3fe593af89 @@ -9,3 +9,4 @@ SHA1 (patch-ac) = 2fa2168a257b60ae194675e3b0abd00bf6c7799b SHA1 (patch-ad) = da2fdad2c8dd225f49f74d1f7c212f1b90babd08 SHA1 (patch-ba) = 65fd25c9ae6fd22046a050687154940ab41849b7 SHA1 (patch-zthread_include_zthread_Config.h) = baf716cf89dbf77cee1cfc53e25d4a1f6921cb8e +SHA1 (patch-zthread_include_zthread_Guard.h) = c2fe5ceff52bf345f7d98cdbec164063f23377f6 diff --git a/graphics/panomatic/patches/patch-zthread_include_zthread_Guard.h b/graphics/panomatic/patches/patch-zthread_include_zthread_Guard.h new file mode 100644 index 00000000000..72300e2726d --- /dev/null +++ b/graphics/panomatic/patches/patch-zthread_include_zthread_Guard.h @@ -0,0 +1,22 @@ +$NetBSD: patch-zthread_include_zthread_Guard.h,v 1.1 2012/11/16 00:53:01 joerg Exp $ + +--- zthread/include/zthread/Guard.h.orig 2012-11-15 14:59:53.000000000 +0000 ++++ zthread/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)); + + } + |