activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
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 GMT
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<int> > 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 @@
 						>
 					</File>
 					<File
+						RelativePath="..\src\test-integration\activemq\test\CmsConnectionStartStopTest.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\src\test-integration\activemq\test\CmsConnectionStartStopTest.h"
+						>
+					</File>
+					<File
 						RelativePath="..\src\test-integration\activemq\test\CmsTemplateTest.cpp"
 						>
 					</File>
@@ -876,6 +884,14 @@
 							>
 						</File>
 						<File
+							RelativePath="..\src\test-integration\activemq\test\openwire\OpenwireCmsConnectionStartStopTest.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\src\test-integration\activemq\test\openwire\OpenwireCmsConnectionStartStopTest.h"
+							>
+						</File>
+						<File
 							RelativePath="..\src\test-integration\activemq\test\openwire\OpenwireCmsTemplateTest.cpp"
 							>
 						</File>

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"
 				>
 				<File
+					RelativePath="..\src\test\activemq\util\ActiveMQMessageTransformationTest.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\activemq\util\ActiveMQMessageTransformationTest.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\activemq\util\AdvisorySupportTest.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\activemq\util\AdvisorySupportTest.h"
+					>
+				</File>
+				<File
 					RelativePath="..\src\test\activemq\util\IdGeneratorTest.cpp"
 					>
 				</File>
@@ -2083,6 +2099,14 @@
 					>
 				</File>
 				<File
+					RelativePath="..\src\test\decaf\lang\ThreadLocalTest.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\decaf\lang\ThreadLocalTest.h"
+					>
+				</File>
+				<File
 					RelativePath="..\src\test\decaf\lang\ThreadTest.cpp"
 					>
 				</File>
@@ -2247,6 +2271,14 @@
 					>
 				</File>
 				<File
+					RelativePath="..\src\test\decaf\util\BitSetTest.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\decaf\util\BitSetTest.h"
+					>
+				</File>
+				<File
 					RelativePath="..\src\test\decaf\util\DateTest.cpp"
 					>
 				</File>
@@ -2263,6 +2295,22 @@
 					>
 				</File>
 				<File
+					RelativePath="..\src\test\decaf\util\HashCodeTest.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\decaf\util\HashCodeTest.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\decaf\util\HashMapTest.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\decaf\util\HashMapTest.h"
+					>
+				</File>
+				<File
 					RelativePath="..\src\test\decaf\util\LinkedListTest.cpp"
 					>
 				</File>
@@ -2279,6 +2327,14 @@
 					>
 				</File>
 				<File
+					RelativePath="..\src\test\decaf\util\LRUCacheTest.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\decaf\util\LRUCacheTest.h"
+					>
+				</File>
+				<File
 					RelativePath="..\src\test\decaf\util\PriorityQueueTest.cpp"
 					>
 				</File>
@@ -2362,6 +2418,14 @@
 						>
 					</File>
 					<File
+						RelativePath="..\src\test\decaf\util\concurrent\ConcurrentHashMapTest.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\src\test\decaf\util\concurrent\ConcurrentHashMapTest.h"
+						>
+					</File>
+					<File
 						RelativePath="..\src\test\decaf\util\concurrent\ConcurrentStlMapTest.cpp"
 						>
 					</File>
@@ -2520,6 +2584,14 @@
 							RelativePath="..\src\test\decaf\util\concurrent\locks\ReentrantLockTest.h"
 							>
 						</File>
+						<File
+							RelativePath="..\src\test\decaf\util\concurrent\locks\ReentrantReadWriteLockTest.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\src\test\decaf\util\concurrent\locks\ReentrantReadWriteLockTest.h"
+							>
+						</File>
 					</Filter>
 				</Filter>
 				<Filter

Modified: activemq/activemq-cpp/trunk/activemq-cpp/vs2008-build/activemq-cpp.vcproj
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/vs2008-build/activemq-cpp.vcproj?rev=1366561&r1=1366560&r2=1366561&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/vs2008-build/activemq-cpp.vcproj (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/vs2008-build/activemq-cpp.vcproj Fri Jul 27 22:41:02
2012
@@ -1590,6 +1590,14 @@
 				>
 			</File>
 			<File
+				RelativePath="..\src\main\cms\MessageTransformer.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\src\main\cms\MessageTransformer.h"
+				>
+			</File>
+			<File
 				RelativePath="..\src\main\cms\ObjectMessage.cpp"
 				>
 			</File>
@@ -1917,6 +1925,14 @@
 				Name="util"
 				>
 				<File
+					RelativePath="..\src\main\activemq\util\ActiveMQMessageTransformation.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\activemq\util\ActiveMQMessageTransformation.h"
+					>
+				</File>
+				<File
 					RelativePath="..\src\main\activemq\util\ActiveMQProperties.cpp"
 					>
 				</File>
@@ -1925,6 +1941,14 @@
 					>
 				</File>
 				<File
+					RelativePath="..\src\main\activemq\util\AdvisorySupport.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\activemq\util\AdvisorySupport.h"
+					>
+				</File>
+				<File
 					RelativePath="..\src\main\activemq\util\CMSExceptionSupport.cpp"
 					>
 				</File>
@@ -2681,6 +2705,14 @@
 					>
 				</File>
 				<File
+					RelativePath="..\src\main\activemq\core\AdvisoryConsumer.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\activemq\core\AdvisoryConsumer.h"
+					>
+				</File>
+				<File
 					RelativePath="..\src\main\activemq\core\DispatchData.h"
 					>
 				</File>
@@ -4447,6 +4479,14 @@
 							>
 						</File>
 						<File
+							RelativePath="..\src\main\decaf\internal\util\concurrent\ThreadLocalImpl.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\decaf\internal\util\concurrent\ThreadLocalImpl.h"
+							>
+						</File>
+						<File
 							RelativePath="..\src\main\decaf\internal\util\concurrent\Transferer.h"
 							>
 						</File>
@@ -4729,6 +4769,10 @@
 					>
 				</File>
 				<File
+					RelativePath="..\src\main\decaf\lang\Readable.h"
+					>
+				</File>
+				<File
 					RelativePath="..\src\main\decaf\lang\Runnable.h"
 					>
 				</File>
@@ -4769,9 +4813,33 @@
 					>
 				</File>
 				<File
+					RelativePath="..\src\main\decaf\lang\ThreadGroup.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\lang\ThreadGroup.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\lang\ThreadLocal.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\lang\ThreadLocal.h"
+					>
+				</File>
+				<File
 					RelativePath="..\src\main\decaf\lang\Throwable.h"
 					>
 				</File>
+				<File
+					RelativePath="..\src\main\decaf\lang\Types.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\lang\Types.h"
+					>
+				</File>
 				<Filter
 					Name="exceptions"
 					>
@@ -4796,6 +4864,10 @@
 						>
 					</File>
 					<File
+						RelativePath="..\src\main\decaf\lang\exceptions\IllegalThreadStateException.h"
+						>
+					</File>
+					<File
 						RelativePath="..\src\main\decaf\lang\exceptions\IndexOutOfBoundsException.h"
 						>
 					</File>
@@ -4808,6 +4880,10 @@
 						>
 					</File>
 					<File
+						RelativePath="..\src\main\decaf\lang\exceptions\NegativeArraySizeException.h"
+						>
+					</File>
+					<File
 						RelativePath="..\src\main\decaf\lang\exceptions\NullPointerException.h"
 						>
 					</File>
@@ -4816,6 +4892,10 @@
 						>
 					</File>
 					<File
+						RelativePath="..\src\main\decaf\lang\exceptions\OutOfMemoryError.h"
+						>
+					</File>
+					<File
 						RelativePath="..\src\main\decaf\lang\exceptions\RuntimeException.h"
 						>
 					</File>
@@ -5497,6 +5577,14 @@
 					>
 				</File>
 				<File
+					RelativePath="..\src\main\decaf\util\BitSet.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\util\BitSet.h"
+					>
+				</File>
+				<File
 					RelativePath="..\src\main\decaf\util\Collection.cpp"
 					>
 				</File>
@@ -5505,6 +5593,14 @@
 					>
 				</File>
 				<File
+					RelativePath="..\src\main\decaf\util\Collections.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\util\Collections.h"
+					>
+				</File>
+				<File
 					RelativePath="..\src\main\decaf\util\Comparator.cpp"
 					>
 				</File>
@@ -5541,6 +5637,22 @@
 					>
 				</File>
 				<File
+					RelativePath="..\src\main\decaf\util\HashCode.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\util\HashCode.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\util\HashMap.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\util\HashMap.h"
+					>
+				</File>
+				<File
 					RelativePath="..\src\main\decaf\util\Iterator.cpp"
 					>
 				</File>
@@ -5573,6 +5685,14 @@
 					>
 				</File>
 				<File
+					RelativePath="..\src\main\decaf\util\LRUCache.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\util\LRUCache.h"
+					>
+				</File>
+				<File
 					RelativePath="..\src\main\decaf\util\Map.cpp"
 					>
 				</File>
@@ -5581,6 +5701,14 @@
 					>
 				</File>
 				<File
+					RelativePath="..\src\main\decaf\util\MapEntry.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\util\MapEntry.h"
+					>
+				</File>
+				<File
 					RelativePath="..\src\main\decaf\util\NoSuchElementException.cpp"
 					>
 				</File>
@@ -5736,6 +5864,14 @@
 						>
 					</File>
 					<File
+						RelativePath="..\src\main\decaf\util\concurrent\ConcurrentHashMap.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\decaf\util\concurrent\ConcurrentHashMap.h"
+						>
+					</File>
+					<File
 						RelativePath="..\src\main\decaf\util\concurrent\ConcurrentMap.cpp"
 						>
 					</File>
@@ -6002,6 +6138,14 @@
 							RelativePath="..\src\main\decaf\util\concurrent\locks\ReentrantLock.h"
 							>
 						</File>
+						<File
+							RelativePath="..\src\main\decaf\util\concurrent\locks\ReentrantReadWriteLock.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\decaf\util\concurrent\locks\ReentrantReadWriteLock.h"
+							>
+						</File>
 					</Filter>
 				</Filter>
 				<Filter



Mime
View raw message