Author: tabish
Date: Mon Mar 19 13:24:24 2012
New Revision: 1302421
URL: http://svn.apache.org/viewvc?rev=1302421&view=rev
Log:
Fix the type used to hold nanoTime, was long should be long long.
Modified:
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/concurrent/locks/AbstractQueuedSynchronizer.cpp
Modified:
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/concurrent/locks/AbstractQueuedSynchronizer.cpp
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/concurrent/locks/AbstractQueuedSynchronizer.cpp?rev=1302421&r1=1302420&r2=1302421&view=diff
==============================================================================
---
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/concurrent/locks/AbstractQueuedSynchronizer.cpp
(original)
+++
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/concurrent/locks/AbstractQueuedSynchronizer.cpp
Mon Mar 19 13:24:24 2012
@@ -749,7 +749,7 @@ namespace locks {
LockSupport::parkNanos(nanosTimeout);
}
- long now = System::nanoTime();
+ long long now = System::nanoTime();
nanosTimeout -= now - lastTime;
lastTime = now;
@@ -1053,7 +1053,7 @@ namespace locks {
break;
}
- long now = System::nanoTime();
+ long long now = System::nanoTime();
nanosTimeout -= now - lastTime;
lastTime = now;
}