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 2CB3BDC27 for ; Fri, 27 Jul 2012 22:41:52 +0000 (UTC) Received: (qmail 59243 invoked by uid 500); 27 Jul 2012 22:41:52 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 59217 invoked by uid 500); 27 Jul 2012 22:41:52 -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 59201 invoked by uid 99); 27 Jul 2012 22:41:52 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 27 Jul 2012 22:41:52 +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; Fri, 27 Jul 2012 22:41:47 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 1C73C238890B for ; Fri, 27 Jul 2012 22:41:03 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1366561 - in /activemq/activemq-cpp/trunk/activemq-cpp: src/main/decaf/util/ src/test/decaf/util/ src/test/decaf/util/concurrent/locks/ vs2008-build/ Date: Fri, 27 Jul 2012 22:41:02 -0000 To: commits@activemq.apache.org From: tabish@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120727224103.1C73C238890B@eris.apache.org> Author: tabish Date: Fri Jul 27 22:41:02 2012 New Revision: 1366561 URL: http://svn.apache.org/viewvc?rev=1366561&view=rev Log: Get the code building on Windows again. Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/BitSet.cpp activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/util/HashMapTest.cpp activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/util/concurrent/locks/ReentrantReadWriteLockTest.cpp activemq/activemq-cpp/trunk/activemq-cpp/vs2008-build/activemq-cpp-integration-tests.vcproj activemq/activemq-cpp/trunk/activemq-cpp/vs2008-build/activemq-cpp-unittests.vcproj activemq/activemq-cpp/trunk/activemq-cpp/vs2008-build/activemq-cpp.vcproj Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/BitSet.cpp URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/BitSet.cpp?rev=1366561&r1=1366560&r2=1366561&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/BitSet.cpp (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/BitSet.cpp Fri Jul 27 22:41:02 2012 @@ -541,7 +541,7 @@ int BitSet::length() const { return 0; } int i = ELM_SIZE - 1; - long val = bits[idx]; + unsigned long long val = bits[idx]; while ((val & (TWO_N_ARRAY[i])) == 0 && i > 0) { i--; } Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/util/HashMapTest.cpp URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/util/HashMapTest.cpp?rev=1366561&r1=1366560&r2=1366561&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/util/HashMapTest.cpp (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/util/HashMapTest.cpp Fri Jul 27 22:41:02 2012 @@ -374,7 +374,7 @@ void HashMapTest::testPut() { Pointer< Iterator > itr(intSet.iterator()); while (itr->hasNext()) { int key = itr->next(); - if ((found = key) == myKey) { + if (found = (key == myKey)) { break; } } Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/util/concurrent/locks/ReentrantReadWriteLockTest.cpp URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/util/concurrent/locks/ReentrantReadWriteLockTest.cpp?rev=1366561&r1=1366560&r2=1366561&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/util/concurrent/locks/ReentrantReadWriteLockTest.cpp (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/util/concurrent/locks/ReentrantReadWriteLockTest.cpp Fri Jul 27 22:41:02 2012 @@ -32,7 +32,7 @@ using namespace decaf::util::concurrent: //////////////////////////////////////////////////////////////////////////////// namespace { - const int SIZE = 256; + const int SIZEVAL = 256; class InterruptibleLockRunnable : public Runnable { public: @@ -155,11 +155,11 @@ void ReentrantReadWriteLockTest::testFai //////////////////////////////////////////////////////////////////////////////// void ReentrantReadWriteLockTest::testGetWriteHoldCount() { ReentrantReadWriteLock lock; - for (int i = 1; i <= SIZE; i++) { + for (int i = 1; i <= SIZEVAL; i++) { lock.writeLock().lock(); CPPUNIT_ASSERT_EQUAL(i,lock.getWriteHoldCount()); } - for (int i = SIZE; i > 0; i--) { + for (int i = SIZEVAL; i > 0; i--) { lock.writeLock().unlock(); CPPUNIT_ASSERT_EQUAL(i-1,lock.getWriteHoldCount()); } Modified: activemq/activemq-cpp/trunk/activemq-cpp/vs2008-build/activemq-cpp-integration-tests.vcproj URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/vs2008-build/activemq-cpp-integration-tests.vcproj?rev=1366561&r1=1366560&r2=1366561&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/vs2008-build/activemq-cpp-integration-tests.vcproj (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/vs2008-build/activemq-cpp-integration-tests.vcproj Fri Jul 27 22:41:02 2012 @@ -741,6 +741,14 @@ > + + + + @@ -876,6 +884,14 @@ > + + + + Modified: activemq/activemq-cpp/trunk/activemq-cpp/vs2008-build/activemq-cpp-unittests.vcproj URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/vs2008-build/activemq-cpp-unittests.vcproj?rev=1366561&r1=1366560&r2=1366561&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/vs2008-build/activemq-cpp-unittests.vcproj (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/vs2008-build/activemq-cpp-unittests.vcproj Fri Jul 27 22:41:02 2012 @@ -851,6 +851,22 @@ Name="util" > + + + + + + + + @@ -2083,6 +2099,14 @@ > + + + + @@ -2247,6 +2271,14 @@ > + + + + @@ -2263,6 +2295,22 @@ > + + + + + + + + @@ -2279,6 +2327,14 @@ > + + + + @@ -2362,6 +2418,14 @@ > + + + + @@ -2520,6 +2584,14 @@ RelativePath="..\src\test\decaf\util\concurrent\locks\ReentrantLockTest.h" > + + + + + + + + @@ -1917,6 +1925,14 @@ Name="util" > + + + + @@ -1925,6 +1941,14 @@ > + + + + @@ -2681,6 +2705,14 @@ > + + + + @@ -4447,6 +4479,14 @@ > + + + + @@ -4729,6 +4769,10 @@ > + + @@ -4769,9 +4813,33 @@ > + + + + + + + + + + + + @@ -4796,6 +4864,10 @@ > + + @@ -4808,6 +4880,10 @@ > + + @@ -4816,6 +4892,10 @@ > + + @@ -5497,6 +5577,14 @@ > + + + + @@ -5505,6 +5593,14 @@ > + + + + @@ -5541,6 +5637,22 @@ > + + + + + + + + @@ -5573,6 +5685,14 @@ > + + + + @@ -5581,6 +5701,14 @@ > + + + + @@ -5736,6 +5864,14 @@ > + + + + @@ -6002,6 +6138,14 @@ RelativePath="..\src\main\decaf\util\concurrent\locks\ReentrantLock.h" > + + + +