Return-Path: X-Original-To: apmail-activemq-commits-archive@www.apache.org Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 388E62B1B for ; Thu, 21 Apr 2011 14:09:01 +0000 (UTC) Received: (qmail 39012 invoked by uid 500); 21 Apr 2011 14:09:01 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 38951 invoked by uid 500); 21 Apr 2011 14:09:01 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 38944 invoked by uid 99); 21 Apr 2011 14:09:01 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 21 Apr 2011 14:09:01 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 21 Apr 2011 14:08:59 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id DA7A323888BD; Thu, 21 Apr 2011 14:08:39 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: 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 Date: Thu, 21 Apr 2011 14:08:39 -0000 To: commits@activemq.apache.org From: tabish@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110421140839.DA7A323888BD@eris.apache.org> 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 { + class PrimitiveList : public decaf::util::LinkedList { 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.