You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ta...@apache.org on 2010/06/10 12:59:05 UTC
svn commit: r953278 -
/activemq/activemq-cpp/branches/activemq-cpp-3.1.x/activemq-cpp/src/main/decaf/util/concurrent/locks/ReentrantLock.cpp
Author: tabish
Date: Thu Jun 10 10:59:05 2010
New Revision: 953278
URL: http://svn.apache.org/viewvc?rev=953278&view=rev
Log:
https://issues.apache.org/activemq/browse/AMQCPP-295
Modified:
activemq/activemq-cpp/branches/activemq-cpp-3.1.x/activemq-cpp/src/main/decaf/util/concurrent/locks/ReentrantLock.cpp
Modified: activemq/activemq-cpp/branches/activemq-cpp-3.1.x/activemq-cpp/src/main/decaf/util/concurrent/locks/ReentrantLock.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/branches/activemq-cpp-3.1.x/activemq-cpp/src/main/decaf/util/concurrent/locks/ReentrantLock.cpp?rev=953278&r1=953277&r2=953278&view=diff
==============================================================================
--- activemq/activemq-cpp/branches/activemq-cpp-3.1.x/activemq-cpp/src/main/decaf/util/concurrent/locks/ReentrantLock.cpp (original)
+++ activemq/activemq-cpp/branches/activemq-cpp-3.1.x/activemq-cpp/src/main/decaf/util/concurrent/locks/ReentrantLock.cpp Thu Jun 10 10:59:05 2010
@@ -486,7 +486,11 @@ long long ConditionObject::awaitNanos( l
abstime.tv_sec = TimeUnit::NANOSECONDS.toSeconds( delay );
abstime.tv_nsec = delay % 1000000000;
+#ifdef HAVE_PTHREAD_H
unsigned int result = pthread_cond_timedwait( &condition, &lock->handle, &abstime );
+#else
+
+#endif
// restore the owner
lock->lock_owner = lock_owner;