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 2011/04/21 16:08:39 UTC
svn commit: r1095726 - in
/activemq/activemq-cpp/branches/activemq-cpp-3.4.x/activemq-cpp/src/main:
activemq/util/PrimitiveList.h decaf/util/concurrent/Executor.h
decaf/util/concurrent/ExecutorService.h
decaf/util/concurrent/ThreadPoolExecutor.cpp
Author: tabish
Date: Thu Apr 21 14:08:39 2011
New Revision: 1095726
URL: http://svn.apache.org/viewvc?rev=1095726&view=rev
Log:
Make some changes to improve the Windows build of DLLs for this branch
Modified:
activemq/activemq-cpp/branches/activemq-cpp-3.4.x/activemq-cpp/src/main/activemq/util/PrimitiveList.h
activemq/activemq-cpp/branches/activemq-cpp-3.4.x/activemq-cpp/src/main/decaf/util/concurrent/Executor.h
activemq/activemq-cpp/branches/activemq-cpp-3.4.x/activemq-cpp/src/main/decaf/util/concurrent/ExecutorService.h
activemq/activemq-cpp/branches/activemq-cpp-3.4.x/activemq-cpp/src/main/decaf/util/concurrent/ThreadPoolExecutor.cpp
Modified: activemq/activemq-cpp/branches/activemq-cpp-3.4.x/activemq-cpp/src/main/activemq/util/PrimitiveList.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/branches/activemq-cpp-3.4.x/activemq-cpp/src/main/activemq/util/PrimitiveList.h?rev=1095726&r1=1095725&r2=1095726&view=diff
==============================================================================
--- activemq/activemq-cpp/branches/activemq-cpp-3.4.x/activemq-cpp/src/main/activemq/util/PrimitiveList.h (original)
+++ activemq/activemq-cpp/branches/activemq-cpp-3.4.x/activemq-cpp/src/main/activemq/util/PrimitiveList.h Thu Apr 21 14:08:39 2011
@@ -33,7 +33,7 @@ namespace util{
/**
* List of primitives.
*/
- class AMQCPP_API PrimitiveList : public decaf::util::LinkedList<PrimitiveValueNode> {
+ class PrimitiveList : public decaf::util::LinkedList<PrimitiveValueNode> {
private:
PrimitiveValueConverter converter;
Modified: activemq/activemq-cpp/branches/activemq-cpp-3.4.x/activemq-cpp/src/main/decaf/util/concurrent/Executor.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/branches/activemq-cpp-3.4.x/activemq-cpp/src/main/decaf/util/concurrent/Executor.h?rev=1095726&r1=1095725&r2=1095726&view=diff
==============================================================================
--- activemq/activemq-cpp/branches/activemq-cpp-3.4.x/activemq-cpp/src/main/decaf/util/concurrent/Executor.h (original)
+++ activemq/activemq-cpp/branches/activemq-cpp-3.4.x/activemq-cpp/src/main/decaf/util/concurrent/Executor.h Thu Apr 21 14:08:39 2011
@@ -84,7 +84,7 @@ namespace concurrent {
*
* @since 1.0
*/
- class Executor {
+ class DECAF_API Executor {
public:
virtual ~Executor() {}
Modified: activemq/activemq-cpp/branches/activemq-cpp-3.4.x/activemq-cpp/src/main/decaf/util/concurrent/ExecutorService.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/branches/activemq-cpp-3.4.x/activemq-cpp/src/main/decaf/util/concurrent/ExecutorService.h?rev=1095726&r1=1095725&r2=1095726&view=diff
==============================================================================
--- activemq/activemq-cpp/branches/activemq-cpp-3.4.x/activemq-cpp/src/main/decaf/util/concurrent/ExecutorService.h (original)
+++ activemq/activemq-cpp/branches/activemq-cpp-3.4.x/activemq-cpp/src/main/decaf/util/concurrent/ExecutorService.h Thu Apr 21 14:08:39 2011
@@ -51,7 +51,7 @@ namespace concurrent {
*
* @since 1.0
*/
- class ExecutorService : public Executor {
+ class DECAF_API ExecutorService : public Executor {
public:
virtual ~ExecutorService() {}
Modified: activemq/activemq-cpp/branches/activemq-cpp-3.4.x/activemq-cpp/src/main/decaf/util/concurrent/ThreadPoolExecutor.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/branches/activemq-cpp-3.4.x/activemq-cpp/src/main/decaf/util/concurrent/ThreadPoolExecutor.cpp?rev=1095726&r1=1095725&r2=1095726&view=diff
==============================================================================
--- activemq/activemq-cpp/branches/activemq-cpp-3.4.x/activemq-cpp/src/main/decaf/util/concurrent/ThreadPoolExecutor.cpp (original)
+++ activemq/activemq-cpp/branches/activemq-cpp-3.4.x/activemq-cpp/src/main/decaf/util/concurrent/ThreadPoolExecutor.cpp Thu Apr 21 14:08:39 2011
@@ -604,8 +604,8 @@ void ThreadPoolExecutor::setKeepAliveTim
"Keep Alive Time must be set to a non-zero value when allowCoreThreadsTimeout is enabled.");
}
- long keepAliveTime = unit.toMillis(timeout);
- long delta = keepAliveTime - this->kernel->keepAliveTime;
+ long long keepAliveTime = unit.toMillis(timeout);
+ long long delta = keepAliveTime - this->kernel->keepAliveTime;
this->kernel->keepAliveTime = keepAliveTime;
if (delta < 0) {
// TODO - When Threads are interruptible wake works so they can check timeout.