activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r774892 [1/2] - in /activemq/activemq-cpp/trunk/activemq-cpp: src/main/activemq/wireformat/openwire/marshal/ src/test/decaf/internal/nio/ vs2005-build/
Date Thu, 14 May 2009 19:32:59 GMT
Author: tabish
Date: Thu May 14 19:32:59 2009
New Revision: 774892

URL: http://svn.apache.org/viewvc?rev=774892&view=rev
Log:
Update Windows build to work with latest changes.

Modified:
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/PrimitiveTypesMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/internal/nio/DoubleArrayBufferTest.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/vs2005-build/vs2005-activemq-unittests.vcproj
    activemq/activemq-cpp/trunk/activemq-cpp/vs2005-build/vs2005-activemq.vcproj

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/PrimitiveTypesMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/PrimitiveTypesMarshaller.cpp?rev=774892&r1=774891&r2=774892&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/PrimitiveTypesMarshaller.cpp
(original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/PrimitiveTypesMarshaller.cpp
Thu May 14 19:32:59 2009
@@ -79,7 +79,7 @@
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void PrimitiveTypesMarshaller::marshal( const util::PrimitiveList* list,
+void PrimitiveTypesMarshaller::marshal( const activemq::util::PrimitiveList* list,
                                         std::vector<unsigned char>& dest )
                                             throw ( decaf::lang::Exception ) {
     try {
@@ -98,7 +98,7 @@
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void PrimitiveTypesMarshaller::unmarshal( util::PrimitiveList* list,
+void PrimitiveTypesMarshaller::unmarshal( activemq::util::PrimitiveList* list,
                                           const std::vector<unsigned char>& src
)
                                                 throw ( decaf::lang::Exception ) {
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/internal/nio/DoubleArrayBufferTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/internal/nio/DoubleArrayBufferTest.cpp?rev=774892&r1=774891&r2=774892&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/internal/nio/DoubleArrayBufferTest.cpp
(original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/internal/nio/DoubleArrayBufferTest.cpp
Thu May 14 19:32:59 2009
@@ -509,7 +509,7 @@
 
     for( std::size_t i = 0; i < testBuffer1->capacity(); i++ ) {
         CPPUNIT_ASSERT( testBuffer1->position() == 0 );
-        DoubleBuffer& ret = testBuffer1->put(i, i );
+        DoubleBuffer& ret = testBuffer1->put( i, (double)i );
         CPPUNIT_ASSERT( testBuffer1->get(i) == i );
         CPPUNIT_ASSERT( &ret == testBuffer1 );
     }

Modified: activemq/activemq-cpp/trunk/activemq-cpp/vs2005-build/vs2005-activemq-unittests.vcproj
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/vs2005-build/vs2005-activemq-unittests.vcproj?rev=774892&r1=774891&r2=774892&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/vs2005-build/vs2005-activemq-unittests.vcproj
(original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/vs2005-build/vs2005-activemq-unittests.vcproj
Thu May 14 19:32:59 2009
@@ -1041,11 +1041,11 @@
 							>
 						</File>
 						<File
-							RelativePath="..\src\test\activemq\wireformat\openwire\marshal\PrimitiveMapMarshallerTest.cpp"
+							RelativePath="..\src\test\activemq\wireformat\openwire\marshal\PrimitiveTypesMarshallerTest.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\src\test\activemq\wireformat\openwire\marshal\PrimitiveMapMarshallerTest.h"
+							RelativePath="..\src\test\activemq\wireformat\openwire\marshal\PrimitiveTypesMarshallerTest.h"
 							>
 						</File>
 						<Filter
@@ -10551,6 +10551,14 @@
 					>
 				</File>
 				<File
+					RelativePath="..\src\test\activemq\commands\ActiveMQStreamMessageTest.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\activemq\commands\ActiveMQStreamMessageTest.h"
+					>
+				</File>
+				<File
 					RelativePath="..\src\test\activemq\commands\ActiveMQTempQueueTest.cpp"
 					>
 				</File>



Mime
View raw message