activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r890972 - in /activemq/activemq-cpp/trunk/activemq-cpp: src/main/activemq/commands/ src/main/decaf/lang/ vs2005-build/
Date Tue, 15 Dec 2009 20:19:34 GMT
Author: tabish
Date: Tue Dec 15 20:19:33 2009
New Revision: 890972

URL: http://svn.apache.org/viewvc?rev=890972&view=rev
Log:
https://issues.apache.org/activemq/browse/AMQCPP-272

Add new CMS exception to the Windows Project files and fix any new warnings found while compiling
the code changes.

Modified:
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQBytesMessage.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQBytesMessage.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTextMessage.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/Thread.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/vs2005-build/vs2005-activemq.vcproj

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQBytesMessage.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQBytesMessage.cpp?rev=890972&r1=890971&r2=890972&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQBytesMessage.cpp
(original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQBytesMessage.cpp
Tue Dec 15 20:19:33 2009
@@ -112,7 +112,7 @@
 
         initializeReading();
 
-        int length = this->getBodyLength();
+        std::size_t length = this->getBodyLength();
 
         if( length != 0 ) {
             unsigned char* buffer = new unsigned char[length];

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQBytesMessage.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQBytesMessage.h?rev=890972&r1=890971&r2=890972&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQBytesMessage.h
(original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQBytesMessage.h
Tue Dec 15 20:19:33 2009
@@ -59,7 +59,7 @@
         /**
          * Tracks the actual length of the Message when compressed.
          */
-        mutable int length;
+        mutable std::size_t length;
 
     public:
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTextMessage.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTextMessage.cpp?rev=890972&r1=890971&r2=890972&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTextMessage.cpp
(original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTextMessage.cpp
Tue Dec 15 20:19:33 2009
@@ -126,8 +126,8 @@
     if( this->text.get() != NULL ) {
         unsigned int size = commands::Message::DEFAULT_MESSAGE_SIZE;
 
-        size += getMarshalledProperties().size();
-        size += this->text->size() * 2;
+        size += (unsigned int)getMarshalledProperties().size();
+        size += (unsigned int)this->text->size() * 2;
 
         return size;
     }

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/Thread.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/Thread.cpp?rev=890972&r1=890971&r2=890972&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/Thread.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/Thread.cpp Tue Dec 15 20:19:33
2009
@@ -613,7 +613,7 @@
     // instance so that other threads in Decaf can join it and wait on it.
     if( result == NULL ) {
         result = Thread::createForeignThreadInstance(
-            std::string( "ForeignThread-" ) + Integer::toString( Thread::getId() ) );
+            std::string( "ForeignThread-" ) + Long::toString( Thread::getId() ) );
     }
 
     return (Thread*)result;

Modified: activemq/activemq-cpp/trunk/activemq-cpp/vs2005-build/vs2005-activemq.vcproj
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/vs2005-build/vs2005-activemq.vcproj?rev=890972&r1=890971&r2=890972&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/vs2005-build/vs2005-activemq.vcproj (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/vs2005-build/vs2005-activemq.vcproj Tue Dec 15
20:19:33 2009
@@ -821,6 +821,14 @@
 				RelativePath="..\src\main\cms\Topic.h"
 				>
 			</File>
+			<File
+				RelativePath="..\src\main\cms\UnsupportedOperationException.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\src\main\cms\UnsupportedOperationException.h"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="activemq"



Mime
View raw message