[Midnightbsd-cvs] mports [23060] trunk/devel/zthread: fix build
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Mon Mar 5 22:15:57 EST 2018
Revision: 23060
http://svnweb.midnightbsd.org/mports/?rev=23060
Author: laffer1
Date: 2018-03-05 22:15:56 -0500 (Mon, 05 Mar 2018)
Log Message:
-----------
fix build
Modified Paths:
--------------
trunk/devel/zthread/Makefile
Added Paths:
-----------
trunk/devel/zthread/files/patch-include__zthread__Barrier.h
trunk/devel/zthread/files/patch-include__zthread__BlockingQueue.h
trunk/devel/zthread/files/patch-include__zthread__Guard.h
trunk/devel/zthread/files/patch-src__MutexImpl.h
trunk/devel/zthread/files/patch-src__ThreadQueue.cxx
Removed Paths:
-------------
trunk/devel/zthread/files/patch-include_zthread_Guard.h
trunk/devel/zthread/files/patch-src_MutexImpl.h
Modified: trunk/devel/zthread/Makefile
===================================================================
--- trunk/devel/zthread/Makefile 2018-03-06 03:12:52 UTC (rev 23059)
+++ trunk/devel/zthread/Makefile 2018-03-06 03:15:56 UTC (rev 23060)
@@ -11,6 +11,7 @@
COMMENT= Platform-independent object-oriented C++ threading library
LICENSE= mit
+LICENSE_FILE= ${WRKSRC}/COPYING
USES= gmake libtool
GNU_CONFIGURE= yes
Added: trunk/devel/zthread/files/patch-include__zthread__Barrier.h
===================================================================
--- trunk/devel/zthread/files/patch-include__zthread__Barrier.h (rev 0)
+++ trunk/devel/zthread/files/patch-include__zthread__Barrier.h 2018-03-06 03:15:56 UTC (rev 23060)
@@ -0,0 +1,20 @@
+--- include/zthread/Barrier.h.orig 2005-03-13 05:23:00 UTC
++++ include/zthread/Barrier.h
+@@ -150,7 +150,7 @@ namespace ZThread {
+
+ } else {
+
+- int myGeneration = _generation;
++ unsigned int myGeneration = _generation;
+
+ try {
+
+@@ -251,7 +251,7 @@ namespace ZThread {
+
+ } else {
+
+- int myGeneration = _generation;
++ unsigned int myGeneration = _generation;
+
+ try {
+
Property changes on: trunk/devel/zthread/files/patch-include__zthread__Barrier.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/devel/zthread/files/patch-include__zthread__BlockingQueue.h
===================================================================
--- trunk/devel/zthread/files/patch-include__zthread__BlockingQueue.h (rev 0)
+++ trunk/devel/zthread/files/patch-include__zthread__BlockingQueue.h 2018-03-06 03:15:56 UTC (rev 23060)
@@ -0,0 +1,11 @@
+--- include/zthread/BlockingQueue.h.orig 2005-03-13 02:04:18 UTC
++++ include/zthread/BlockingQueue.h
+@@ -83,7 +83,7 @@ namespace ZThread {
+ /**
+ * @see Queue::add(const T& item, unsigned long timeout)
+ */
+- virtual bool add(T item, unsigned long timeout) {
++ virtual bool add(const T& item, unsigned long timeout) {
+
+ try {
+
Property changes on: trunk/devel/zthread/files/patch-include__zthread__BlockingQueue.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/devel/zthread/files/patch-include__zthread__Guard.h
===================================================================
--- trunk/devel/zthread/files/patch-include__zthread__Guard.h (rev 0)
+++ trunk/devel/zthread/files/patch-include__zthread__Guard.h 2018-03-06 03:15:56 UTC (rev 23060)
@@ -0,0 +1,38 @@
+--- include/zthread/Guard.h.orig 2005-03-13 02:10:09 UTC
++++ 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));
+
+ }
+
+@@ -458,7 +458,7 @@ public:
+ 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));
+
+ }
+
+@@ -491,7 +491,7 @@ Guard<LockType, LockingPolicy>::~Guard()
+
+ try {
+
+- if(!isDisabled())
++ if(!this->isDisabled())
+ LockingPolicy::destroyScope(*this);
+
+ } catch (...) { /* ignore */ }
Property changes on: trunk/devel/zthread/files/patch-include__zthread__Guard.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Deleted: trunk/devel/zthread/files/patch-include_zthread_Guard.h
===================================================================
--- trunk/devel/zthread/files/patch-include_zthread_Guard.h 2018-03-06 03:12:52 UTC (rev 23059)
+++ trunk/devel/zthread/files/patch-include_zthread_Guard.h 2018-03-06 03:15:56 UTC (rev 23060)
@@ -1,11 +0,0 @@
---- include/zthread/Guard.h.orig Wed Jul 30 00:40:13 2003
-+++ include/zthread/Guard.h Fri Dec 24 21:15:17 2004
-@@ -490,7 +490,7 @@
-
- try {
-
-- if(!isDisabled())
-+ if(!this->isDisabled())
- LockingPolicy::destroyScope(*this);
-
- } catch (...) { /* ignore */ }
Deleted: trunk/devel/zthread/files/patch-src_MutexImpl.h
===================================================================
--- trunk/devel/zthread/files/patch-src_MutexImpl.h 2018-03-06 03:12:52 UTC (rev 23059)
+++ trunk/devel/zthread/files/patch-src_MutexImpl.h 2018-03-06 03:15:56 UTC (rev 23060)
@@ -1,83 +0,0 @@
---- src/MutexImpl.h.orig Wed Jul 30 00:40:14 2003
-+++ src/MutexImpl.h Fri Dec 24 21:15:17 2004
-@@ -153,7 +153,7 @@
-
- _owner = self;
-
-- ownerAcquired(self);
-+ this->ownerAcquired(self);
-
- }
-
-@@ -164,7 +164,7 @@
- _waiters.insert(self);
- m.acquire();
-
-- waiterArrived(self);
-+ this->waiterArrived(self);
-
- {
-
-@@ -173,7 +173,7 @@
-
- }
-
-- waiterDeparted(self);
-+ this->waiterDeparted(self);
-
- m.release();
-
-@@ -192,7 +192,7 @@
- assert(_owner == 0);
- _owner = self;
-
-- ownerAcquired(self);
-+ this->ownerAcquired(self);
-
- break;
-
-@@ -236,7 +236,7 @@
-
- _owner = self;
-
-- ownerAcquired(self);
-+ this->ownerAcquired(self);
-
- }
-
-@@ -253,7 +253,7 @@
-
- m.acquire();
-
-- waiterArrived(self);
-+ this->waiterArrived(self);
-
- {
-
-@@ -262,7 +262,7 @@
-
- }
-
-- waiterDeparted(self);
-+ this->waiterDeparted(self);
-
- m.release();
-
-@@ -284,7 +284,7 @@
- assert(0 == _owner);
- _owner = self;
-
-- ownerAcquired(self);
-+ this->ownerAcquired(self);
-
- break;
-
-@@ -326,7 +326,7 @@
-
- _owner = 0;
-
-- ownerReleased(impl);
-+ this->ownerReleased(impl);
-
- // Try to find a waiter with a backoff & retry scheme
- for(;;) {
Added: trunk/devel/zthread/files/patch-src__MutexImpl.h
===================================================================
--- trunk/devel/zthread/files/patch-src__MutexImpl.h (rev 0)
+++ trunk/devel/zthread/files/patch-src__MutexImpl.h 2018-03-06 03:15:56 UTC (rev 23060)
@@ -0,0 +1,83 @@
+--- src/MutexImpl.h.orig 2005-03-13 03:59:15 UTC
++++ src/MutexImpl.h
+@@ -153,7 +153,7 @@ void MutexImpl<List, Behavior>::acquire(
+
+ _owner = self;
+
+- ownerAcquired(self);
++ this->ownerAcquired(self);
+
+ }
+
+@@ -164,7 +164,7 @@ void MutexImpl<List, Behavior>::acquire(
+ _waiters.insert(self);
+ m.acquire();
+
+- waiterArrived(self);
++ this->waiterArrived(self);
+
+ {
+
+@@ -173,7 +173,7 @@ void MutexImpl<List, Behavior>::acquire(
+
+ }
+
+- waiterDeparted(self);
++ this->waiterDeparted(self);
+
+ m.release();
+
+@@ -192,7 +192,7 @@ void MutexImpl<List, Behavior>::acquire(
+ assert(_owner == 0);
+ _owner = self;
+
+- ownerAcquired(self);
++ this->ownerAcquired(self);
+
+ break;
+
+@@ -236,7 +236,7 @@ bool MutexImpl<List, Behavior>::tryAcqui
+
+ _owner = self;
+
+- ownerAcquired(self);
++ this->ownerAcquired(self);
+
+ }
+
+@@ -253,7 +253,7 @@ bool MutexImpl<List, Behavior>::tryAcqui
+
+ m.acquire();
+
+- waiterArrived(self);
++ this->waiterArrived(self);
+
+ {
+
+@@ -262,7 +262,7 @@ bool MutexImpl<List, Behavior>::tryAcqui
+
+ }
+
+- waiterDeparted(self);
++ this->waiterDeparted(self);
+
+ m.release();
+
+@@ -284,7 +284,7 @@ bool MutexImpl<List, Behavior>::tryAcqui
+ assert(0 == _owner);
+ _owner = self;
+
+- ownerAcquired(self);
++ this->ownerAcquired(self);
+
+ break;
+
+@@ -326,7 +326,7 @@ void MutexImpl<List, Behavior>::release(
+
+ _owner = 0;
+
+- ownerReleased(impl);
++ this->ownerReleased(impl);
+
+ // Try to find a waiter with a backoff & retry scheme
+ for(;;) {
Property changes on: trunk/devel/zthread/files/patch-src__MutexImpl.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/devel/zthread/files/patch-src__ThreadQueue.cxx
===================================================================
--- trunk/devel/zthread/files/patch-src__ThreadQueue.cxx (rev 0)
+++ trunk/devel/zthread/files/patch-src__ThreadQueue.cxx 2018-03-06 03:15:56 UTC (rev 23060)
@@ -0,0 +1,16 @@
+--- src/ThreadQueue.cxx.orig 2005-03-13 03:55:23 UTC
++++ src/ThreadQueue.cxx
+@@ -139,11 +139,12 @@ namespace ZThread {
+
+ // Wake the main thread,if its waiting, when the last pending-thread becomes available;
+ // Otherwise, take note that no wait for pending threads to finish is needed
+- if(_userThreads.empty())
++ if(_userThreads.empty()) {
+ if(_waiter && _waiter != (ThreadImpl*)1)
+ _waiter->getMonitor().notify();
+ else
+ _waiter = (ThreadImpl*)!_waiter;
++ }
+
+ ZTDEBUG("1 pending-thread added.\n");
+
Property changes on: trunk/devel/zthread/files/patch-src__ThreadQueue.cxx
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
More information about the Midnightbsd-cvs
mailing list