activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r689072 - in /activemq/activemq-cpp/trunk/src/main/activemq/connector: openwire/OpenWireConnector.cpp openwire/OpenWireProducerInfo.h stomp/StompCommandReader.cpp
Date Tue, 26 Aug 2008 13:36:25 GMT
Author: tabish
Date: Tue Aug 26 06:36:24 2008
New Revision: 689072

URL: http://svn.apache.org/viewvc?rev=689072&view=rev
Log:
Fix warnings on Windows

Modified:
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireConnector.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireProducerInfo.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/stomp/StompCommandReader.cpp

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireConnector.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireConnector.cpp?rev=689072&r1=689071&r2=689072&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireConnector.cpp
(original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireConnector.cpp
Tue Aug 26 06:36:24 2008
@@ -1027,7 +1027,7 @@
             consumerInfo->getConsumerInfo()->getConsumerId()->cloneDataStructure()
);
         ack.setDestination( amqMessage->getDestination()->cloneDataStructure() );
         ack.setLastMessageId( amqMessage->getMessageId()->cloneDataStructure() );
-        ack.setMessageCount( messages.size() );
+        ack.setMessageCount( (int)messages.size() );
 
         if( session->getAckMode() == cms::Session::SESSION_TRANSACTED ) {
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireProducerInfo.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireProducerInfo.h?rev=689072&r1=689071&r2=689072&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireProducerInfo.h
(original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireProducerInfo.h
Tue Aug 26 06:36:24 2008
@@ -200,8 +200,8 @@
          * @param windowSize - The number of message to send before a block to wait for
          * the receipt of a ProducerAck.
          */
-        virtual void setProducerWindow( unsigned long long timeout ) {
-            this->sendTimeout = timeout;
+        virtual void setProducerWindow( unsigned long long window ) {
+            this->producerWindow = window;
         }
 
     };

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/stomp/StompCommandReader.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/stomp/StompCommandReader.cpp?rev=689072&r1=689071&r2=689072&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/stomp/StompCommandReader.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/stomp/StompCommandReader.cpp Tue
Aug 26 06:36:24 2008
@@ -20,6 +20,7 @@
 #include <decaf/lang/Thread.h>
 #include <decaf/lang/Character.h>
 #include <decaf/lang/Long.h>
+#include <decaf/lang/Integer.h>
 
 using namespace std;
 using namespace activemq;
@@ -231,7 +232,7 @@
         // Clear any data from the buffer.
         buffer.clear();
 
-        unsigned long content_length = 0;
+        unsigned int content_length = 0;
 
         if(frame.getProperties().hasProperty(
             commands::CommandConstants::toString(
@@ -242,7 +243,7 @@
                     commands::CommandConstants::toString(
                         commands::CommandConstants::HEADER_CONTENTLENGTH));
 
-            content_length = (unsigned long long)Long::parseLong( length );
+            content_length = (unsigned int)Integer::parseInt( length );
          }
 
          if( content_length != 0 ) {
@@ -261,8 +262,8 @@
             // us to adapt to that size so that future messages that are
             // around that size won't alloc any new memory.
 
-            buffer.reserve( content_length );
-            buffer.resize( content_length );
+            buffer.reserve( (std::size_t)content_length );
+            buffer.resize( (std::size_t)content_length );
 
             // Read the Content Length now
             read( &buffer[0], content_length );



Mime
View raw message