activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r925834 [1/3] - in /activemq/activemq-cpp/trunk/activemq-cpp/src: examples/ examples/topics/chat/ main/activemq/cmsutil/ main/activemq/commands/ main/activemq/core/ main/activemq/util/ main/activemq/wireformat/openwire/ main/activemq/wirefo...
Date Sun, 21 Mar 2010 17:30:58 GMT
Author: tabish
Date: Sun Mar 21 17:30:56 2010
New Revision: 925834

URL: http://svn.apache.org/viewvc?rev=925834&view=rev
Log:
More work on unifying the types used throughout the API.  Also fixes many compiler warnings on GCC when options -Wconversion and -Werror are added to the configure stage.

Modified:
    activemq/activemq-cpp/trunk/activemq-cpp/src/examples/main.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/examples/topics/chat/Chat.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/PooledSession.h
    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/ActiveMQStreamMessage.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQStreamMessage.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConnectionControl.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConnectionControl.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConnectionInfo.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConnectionInfo.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQSession.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQSession.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/MarshallingSupport.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/OpenWireFormat.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/BaseDataStreamMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/PrimitiveTypesMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v1/MessageMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v1/PartialCommandMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v1/WireFormatInfoMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v1/XATransactionIdMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v2/MessageMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v2/PartialCommandMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v2/WireFormatInfoMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v2/XATransactionIdMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v3/MessageMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v3/PartialCommandMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v3/WireFormatInfoMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v3/XATransactionIdMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v4/MessageMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v4/PartialCommandMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v4/WireFormatInfoMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v4/XATransactionIdMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v5/MessageMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v5/PartialCommandMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v5/WireFormatInfoMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v5/XATransactionIdMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/utils/BooleanStream.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/BytesMessage.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/Session.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/StreamMessage.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/nio/ByteArrayBuffer.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/nio/DoubleArrayBuffer.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/nio/FloatArrayBuffer.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/nio/IntArrayBuffer.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/nio/LongArrayBuffer.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/nio/ShortArrayBuffer.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/util/ByteArrayAdapter.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/util/ByteArrayAdapter.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/ByteArrayInputStream.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/ByteArrayInputStream.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/ByteArrayOutputStream.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/PriorityQueue.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/zip/Adler32.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/zip/CRC32.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/zip/Deflater.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/zip/Inflater.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/test-benchmarks/benchmark/PerformanceTimer.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/test-benchmarks/decaf/io/ByteArrayInputStreamBenchmark.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/activemq/test/openwire/OpenwireSimpleTest.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/cmsutil/DummySession.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/commands/ActiveMQBytesMessageTest.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/commands/ActiveMQMapMessageTest.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/commands/ActiveMQStreamMessageTest.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/util/MarshallingSupportTest.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/BaseDataStreamMarshallerTest.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/utils/BooleanStreamTest.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/internal/nio/ByteArrayBufferTest.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/internal/nio/CharArrayBufferTest.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/internal/nio/FloatArrayBufferTest.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/internal/nio/ShortArrayBufferTest.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/internal/util/ByteArrayAdapterTest.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/BufferedInputStreamTest.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/BufferedOutputStreamTest.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/ByteArrayInputStreamTest.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/ByteArrayOutputStreamTest.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/DataInputStreamTest.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/DataInputStreamTest.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/DataOutputStreamTest.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/FilterInputStreamTest.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/FilterOutputStreamTest.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/InputStreamReaderTest.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/OutputStreamWriterTest.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/ReaderTest.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/WriterTest.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/net/SocketFactoryTest.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/net/SocketTest.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/net/SocketTest.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/util/Endian.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/util/zip/Adler32Test.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/util/zip/CRC32Test.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/util/zip/CheckedInputStreamTest.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/util/zip/DeflaterOutputStreamTest.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/util/zip/DeflaterTest.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/util/zip/InflaterInputStreamTest.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/util/zip/InflaterTest.cpp

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/examples/main.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/examples/main.cpp?rev=925834&r1=925833&r2=925834&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/examples/main.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/examples/main.cpp Sun Mar 21 17:30:56 2010
@@ -186,10 +186,10 @@ private:
 public:
 
     HelloWorldConsumer( const std::string& brokerURI,
-                        long numMessages,
+                        int numMessages,
                         bool useTopic = false,
                         bool sessionTransacted = false,
-                        long waitMillis = 30000 )
+                        int waitMillis = 30000 )
                          : latch(1), doneLatch(numMessages){
         this->connection = NULL;
         this->session = NULL;
@@ -407,7 +407,7 @@ int main(int argc AMQCPP_UNUSED, char* a
     consumerThread.join();
 
     long long endTime = System::currentTimeMillis();
-    double totalTime = (endTime - startTime) / 1000.0;
+    double totalTime = (double)(endTime - startTime) / 1000.0;
 
     consumer.close();
     producer.close();

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/examples/topics/chat/Chat.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/examples/topics/chat/Chat.cpp?rev=925834&r1=925833&r2=925834&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/examples/topics/chat/Chat.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/examples/topics/chat/Chat.cpp Sun Mar 21 17:30:56 2010
@@ -134,7 +134,7 @@ void Chat::run() {
 #endif
             else if( strlen(s) > 0 ) {
 
-                int cch = this->username.length() + strlen(s) + strlen(": ") + 1;
+                int cch = (int)( this->username.length() + strlen(s) + strlen(": ") + 1 );
                 char *text = new char[cch];
 
                 if( text != NULL ) {

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/PooledSession.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/PooledSession.h?rev=925834&r1=925833&r2=925834&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/PooledSession.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/PooledSession.h Sun Mar 21 17:30:56 2010
@@ -195,7 +195,7 @@ namespace cmsutil {
 
         virtual cms::BytesMessage* createBytesMessage(
             const unsigned char* bytes,
-            std::size_t bytesSize )
+            int bytesSize )
                 throw ( cms::CMSException) {
             return session->createBytesMessage( bytes, bytesSize );
         }

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=925834&r1=925833&r2=925834&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 Sun Mar 21 17:30:56 2010
@@ -42,11 +42,11 @@ namespace{
     class ByteCounterOutputStream : public FilterOutputStream {
     private:
 
-        std::size_t* length;
+        int* length;
 
     public:
 
-        ByteCounterOutputStream( std::size_t* length, OutputStream* stream, bool own = false )
+        ByteCounterOutputStream( int* length, OutputStream* stream, bool own = false )
             : FilterOutputStream( stream, own ), length( length ) {
         }
 
@@ -59,15 +59,16 @@ namespace{
             FilterOutputStream::doWriteByte( value );
         }
 
-        virtual void doWriteArray( const unsigned char* buffer, std::size_t size )
-            throw( decaf::io::IOException ) {
+        virtual void doWriteArray( const unsigned char* buffer, int size )
+            throw ( decaf::io::IOException,
+                    decaf::lang::exceptions::NullPointerException,
+                    decaf::lang::exceptions::IndexOutOfBoundsException ) {
 
             (*length) += size;
             FilterOutputStream::doWriteArray( buffer, size );
         }
 
-        virtual void doWriteArrayBounded( const unsigned char* buffer, std::size_t size,
-                                          std::size_t offset, std::size_t length )
+        virtual void doWriteArrayBounded( const unsigned char* buffer, int size, int offset, int length )
             throw ( decaf::io::IOException,
                     decaf::lang::exceptions::NullPointerException,
                     decaf::lang::exceptions::IndexOutOfBoundsException ) {
@@ -136,7 +137,7 @@ bool ActiveMQBytesMessage::equals( const
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void ActiveMQBytesMessage::setBodyBytes( const unsigned char* buffer, std::size_t numBytes )
+void ActiveMQBytesMessage::setBodyBytes( const unsigned char* buffer, int numBytes )
     throw( cms::MessageNotWriteableException, cms::CMSException ) {
 
     try{
@@ -155,7 +156,7 @@ unsigned char* ActiveMQBytesMessage::get
 
         initializeReading();
 
-        std::size_t length = this->getBodyLength();
+        int length = this->getBodyLength();
 
         if( length != 0 ) {
             unsigned char* buffer = new unsigned char[length];
@@ -169,7 +170,7 @@ unsigned char* ActiveMQBytesMessage::get
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-std::size_t ActiveMQBytesMessage::getBodyLength() const
+int ActiveMQBytesMessage::getBodyLength() const
     throw( cms::MessageNotReadableException, cms::CMSException ) {
 
     try{
@@ -274,10 +275,10 @@ void ActiveMQBytesMessage::writeByte( un
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-std::size_t ActiveMQBytesMessage::readBytes( std::vector<unsigned char>& value ) const
+int ActiveMQBytesMessage::readBytes( std::vector<unsigned char>& value ) const
     throw ( cms::MessageEOFException, cms::MessageNotReadableException, cms::CMSException ) {
 
-    return this->readBytes( &value[0], value.size() );
+    return this->readBytes( &value[0], (int)value.size() );
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -295,16 +296,16 @@ void ActiveMQBytesMessage::writeBytes( c
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-std::size_t ActiveMQBytesMessage::readBytes( unsigned char* buffer, std::size_t length ) const
+int ActiveMQBytesMessage::readBytes( unsigned char* buffer, int length ) const
     throw ( cms::MessageEOFException, cms::MessageNotReadableException, cms::CMSException ) {
 
     initializeReading();
     try{
 
-        std::size_t n = 0;
+        int n = 0;
 
         while( n < length ) {
-            int count = this->dataIn->read( buffer, length, n, length - n );
+            int count = this->dataIn->read( buffer, (int)length, (int)n, (int)(length - n) );
             if( count < 0 ) {
                 break;
             }
@@ -327,7 +328,7 @@ std::size_t ActiveMQBytesMessage::readBy
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void ActiveMQBytesMessage::writeBytes( const unsigned char* value, std::size_t offset, std::size_t length )
+void ActiveMQBytesMessage::writeBytes( const unsigned char* value, int offset, int length )
     throw ( cms::MessageNotWriteableException, cms::CMSException ) {
 
     initializeWriting();
@@ -663,7 +664,7 @@ void ActiveMQBytesMessage::initializeRea
                 is = new InflaterInputStream( is, true );
 
             } else {
-                this->length = this->getContent().size();
+                this->length = (int)this->getContent().size();
             }
             this->dataIn.reset( new DataInputStream( is, true ) );
         }

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=925834&r1=925833&r2=925834&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 Sun Mar 21 17:30:56 2010
@@ -59,7 +59,7 @@ namespace commands{
         /**
          * Tracks the actual length of the Message when compressed.
          */
-        mutable std::size_t length;
+        mutable int length;
 
     public:
 
@@ -140,7 +140,7 @@ namespace commands{
          * @throws CMSException - If an internal error occurs.
          * @throws MessageNotWriteableException - if in Read Only Mode.
          */
-        virtual void setBodyBytes( const unsigned char* buffer, std::size_t numBytes )
+        virtual void setBodyBytes( const unsigned char* buffer, int numBytes )
             throw( cms::MessageNotWriteableException, cms::CMSException );
 
         /**
@@ -165,7 +165,7 @@ namespace commands{
          * @throws CMSException - If an internal error occurs.
          * @throws MessageNotReadableException - If the message is in Write Only Mode.
          */
-        virtual std::size_t getBodyLength() const
+        virtual int getBodyLength() const
             throw( cms::MessageNotReadableException, cms::CMSException );
 
         /**
@@ -256,7 +256,7 @@ namespace commands{
          * @throws MessageEOFException - if unexpected end of bytes stream has been reached.
          * @throws MessageNotReadableException - if the message is in write-only mode.
          */
-        virtual std::size_t readBytes( std::vector<unsigned char>& value ) const
+        virtual int readBytes( std::vector<unsigned char>& value ) const
             throw ( cms::MessageEOFException,
                     cms::MessageNotReadableException,
                     cms::CMSException );
@@ -306,7 +306,7 @@ namespace commands{
          * @throws MessageEOFException - if unexpected end of bytes stream has been reached.
          * @throws MessageNotReadableException - if the message is in write-only mode.
          */
-        virtual std::size_t readBytes( unsigned char* buffer, std::size_t length ) const
+        virtual int readBytes( unsigned char* buffer, int length ) const
             throw ( cms::MessageEOFException,
                     cms::MessageNotReadableException,
                     cms::CMSException );
@@ -326,7 +326,7 @@ namespace commands{
          *                        some internal error.
          * @throws MessageNotWriteableException - if the message is in read-only mode.
          */
-        virtual void writeBytes( const unsigned char* value, std::size_t offset, std::size_t length )
+        virtual void writeBytes( const unsigned char* value, int offset, int length )
             throw ( cms::MessageNotWriteableException, cms::CMSException );
 
         /**

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQStreamMessage.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQStreamMessage.cpp?rev=925834&r1=925833&r2=925834&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQStreamMessage.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQStreamMessage.cpp Sun Mar 21 17:30:56 2010
@@ -260,7 +260,7 @@ void ActiveMQStreamMessage::writeByte( u
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-std::size_t ActiveMQStreamMessage::readBytes( std::vector<unsigned char>& value ) const
+int ActiveMQStreamMessage::readBytes( std::vector<unsigned char>& value ) const
     throw ( cms::MessageEOFException,
             cms::MessageFormatException,
             cms::MessageNotReadableException,
@@ -270,7 +270,7 @@ std::size_t ActiveMQStreamMessage::readB
         return 0;
     }
 
-    return this->readBytes( &value[0], value.size() );
+    return this->readBytes( &value[0], (int)value.size() );
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -281,7 +281,7 @@ void ActiveMQStreamMessage::writeBytes( 
     initializeWriting();
     try{
 
-        std::size_t size = value.size();
+        int size = (int)value.size();
         this->dataOut->write( PrimitiveValueNode::BYTE_ARRAY_TYPE );
         this->dataOut->writeInt( (int)size );
         this->dataOut->write( &value[0], size, 0, size );
@@ -290,7 +290,7 @@ void ActiveMQStreamMessage::writeBytes( 
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-std::size_t ActiveMQStreamMessage::readBytes( unsigned char* buffer, std::size_t length ) const
+int ActiveMQStreamMessage::readBytes( unsigned char* buffer, int length ) const
     throw ( cms::MessageEOFException,
             cms::MessageFormatException,
             cms::MessageNotReadableException,
@@ -323,7 +323,7 @@ std::size_t ActiveMQStreamMessage::readB
             return -1;
         }
 
-        if( length <= (size_t)this->remainingBytes ) {
+        if( length <= this->remainingBytes ) {
             // small buffer
             this->remainingBytes -= (int)length;
             this->dataIn->readFully( buffer, length );
@@ -345,10 +345,8 @@ std::size_t ActiveMQStreamMessage::readB
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void ActiveMQStreamMessage::writeBytes( const unsigned char* value,
-                                        std::size_t offset,
-                                        std::size_t length ) throw ( cms::MessageNotWriteableException,
-                                                                     cms::CMSException ) {
+void ActiveMQStreamMessage::writeBytes( const unsigned char* value, int offset, int length )
+    throw ( cms::MessageNotWriteableException, cms::CMSException ) {
 
     initializeWriting();
     try{

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQStreamMessage.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQStreamMessage.h?rev=925834&r1=925833&r2=925834&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQStreamMessage.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQStreamMessage.h Sun Mar 21 17:30:56 2010
@@ -202,7 +202,7 @@ namespace commands{
          * @throw MessageFormatException - if this type conversion is invalid.
          * @throw MessageNotReadableException - if the message is in write-only mode.
          */
-        virtual std::size_t readBytes( std::vector<unsigned char>& value ) const
+        virtual int readBytes( std::vector<unsigned char>& value ) const
             throw ( cms::MessageEOFException,
                     cms::MessageFormatException,
                     cms::MessageNotReadableException,
@@ -253,7 +253,7 @@ namespace commands{
          * @throw MessageFormatException - if this type conversion is invalid.
          * @throw MessageNotReadableException - if the message is in write-only mode.
          */
-        virtual std::size_t readBytes( unsigned char* buffer, std::size_t length ) const
+        virtual int readBytes( unsigned char* buffer, int length ) const
             throw ( cms::MessageEOFException,
                     cms::MessageFormatException,
                     cms::MessageNotReadableException,
@@ -273,7 +273,7 @@ namespace commands{
          *                        to some internal error.
          * @throws MessageNotWriteableException - if the message is in read-only mode.
          */
-        virtual void writeBytes( const unsigned char* value, std::size_t offset, std::size_t length )
+        virtual void writeBytes( const unsigned char* value, int offset, int length )
             throw ( cms::MessageNotWriteableException,
                     cms::CMSException );
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConnectionControl.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConnectionControl.cpp?rev=925834&r1=925833&r2=925834&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConnectionControl.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConnectionControl.cpp Sun Mar 21 17:30:56 2010
@@ -45,6 +45,9 @@ ConnectionControl::ConnectionControl() :
     this->faultTolerant = false;
     this->resume = false;
     this->suspend = false;
+    this->connectedBrokers = "";
+    this->reconnectTo = "";
+    this->rebalanceConnection = false;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -85,6 +88,9 @@ void ConnectionControl::copyDataStructur
     this->setFaultTolerant( srcPtr->isFaultTolerant() );
     this->setResume( srcPtr->isResume() );
     this->setSuspend( srcPtr->isSuspend() );
+    this->setConnectedBrokers( srcPtr->getConnectedBrokers() );
+    this->setReconnectTo( srcPtr->getReconnectTo() );
+    this->setRebalanceConnection( srcPtr->isRebalanceConnection() );
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -110,6 +116,12 @@ std::string ConnectionControl::toString(
     stream << "Resume = " << this->isResume();
     stream << ", ";
     stream << "Suspend = " << this->isSuspend();
+    stream << ", ";
+    stream << "ConnectedBrokers = " << this->getConnectedBrokers();
+    stream << ", ";
+    stream << "ReconnectTo = " << this->getReconnectTo();
+    stream << ", ";
+    stream << "RebalanceConnection = " << this->isRebalanceConnection();
     stream << " }";
 
     return stream.str();
@@ -143,6 +155,15 @@ bool ConnectionControl::equals( const Da
     if( this->isSuspend() != valuePtr->isSuspend() ) {
         return false;
     }
+    if( this->getConnectedBrokers() != valuePtr->getConnectedBrokers() ) {
+        return false;
+    }
+    if( this->getReconnectTo() != valuePtr->getReconnectTo() ) {
+        return false;
+    }
+    if( this->isRebalanceConnection() != valuePtr->isRebalanceConnection() ) {
+        return false;
+    }
     if( !BaseCommand::equals( value ) ) {
         return false;
     }
@@ -200,6 +221,46 @@ void ConnectionControl::setSuspend( bool
 }
 
 ////////////////////////////////////////////////////////////////////////////////
+const std::string& ConnectionControl::getConnectedBrokers() const {
+    return connectedBrokers;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+std::string& ConnectionControl::getConnectedBrokers() {
+    return connectedBrokers;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void ConnectionControl::setConnectedBrokers( const std::string& connectedBrokers ) {
+    this->connectedBrokers = connectedBrokers;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+const std::string& ConnectionControl::getReconnectTo() const {
+    return reconnectTo;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+std::string& ConnectionControl::getReconnectTo() {
+    return reconnectTo;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void ConnectionControl::setReconnectTo( const std::string& reconnectTo ) {
+    this->reconnectTo = reconnectTo;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+bool ConnectionControl::isRebalanceConnection() const {
+    return rebalanceConnection;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void ConnectionControl::setRebalanceConnection( bool rebalanceConnection ) {
+    this->rebalanceConnection = rebalanceConnection;
+}
+
+////////////////////////////////////////////////////////////////////////////////
 decaf::lang::Pointer<commands::Command> ConnectionControl::visit( activemq::state::CommandVisitor* visitor ) 
     throw( activemq::exceptions::ActiveMQException ) {
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConnectionControl.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConnectionControl.h?rev=925834&r1=925833&r2=925834&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConnectionControl.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConnectionControl.h Sun Mar 21 17:30:56 2010
@@ -51,6 +51,9 @@ namespace commands{
         bool faultTolerant;
         bool resume;
         bool suspend;
+        std::string connectedBrokers;
+        std::string reconnectTo;
+        bool rebalanceConnection;
 
     public:
 
@@ -118,6 +121,17 @@ namespace commands{
         virtual bool isSuspend() const;
         virtual void setSuspend( bool suspend );
 
+        virtual const std::string& getConnectedBrokers() const;
+        virtual std::string& getConnectedBrokers();
+        virtual void setConnectedBrokers( const std::string& connectedBrokers );
+
+        virtual const std::string& getReconnectTo() const;
+        virtual std::string& getReconnectTo();
+        virtual void setReconnectTo( const std::string& reconnectTo );
+
+        virtual bool isRebalanceConnection() const;
+        virtual void setRebalanceConnection( bool rebalanceConnection );
+
         /**
          * Allows a Visitor to visit this command and return a response to the
          * command based on the command type being visited.  The command will call

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConnectionInfo.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConnectionInfo.cpp?rev=925834&r1=925833&r2=925834&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConnectionInfo.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConnectionInfo.cpp Sun Mar 21 17:30:56 2010
@@ -46,6 +46,7 @@ ConnectionInfo::ConnectionInfo() : BaseC
     this->brokerMasterConnector = false;
     this->manageable = false;
     this->clientMaster = false;
+    this->faultTolerant = false;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -89,6 +90,7 @@ void ConnectionInfo::copyDataStructure( 
     this->setBrokerMasterConnector( srcPtr->isBrokerMasterConnector() );
     this->setManageable( srcPtr->isManageable() );
     this->setClientMaster( srcPtr->isClientMaster() );
+    this->setFaultTolerant( srcPtr->isFaultTolerant() );
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -138,6 +140,8 @@ std::string ConnectionInfo::toString() c
     stream << "Manageable = " << this->isManageable();
     stream << ", ";
     stream << "ClientMaster = " << this->isClientMaster();
+    stream << ", ";
+    stream << "FaultTolerant = " << this->isFaultTolerant();
     stream << " }";
 
     return stream.str();
@@ -190,6 +194,9 @@ bool ConnectionInfo::equals( const DataS
     if( this->isClientMaster() != valuePtr->isClientMaster() ) {
         return false;
     }
+    if( this->isFaultTolerant() != valuePtr->isFaultTolerant() ) {
+        return false;
+    }
     if( !BaseCommand::equals( value ) ) {
         return false;
     }
@@ -302,6 +309,16 @@ void ConnectionInfo::setClientMaster( bo
 }
 
 ////////////////////////////////////////////////////////////////////////////////
+bool ConnectionInfo::isFaultTolerant() const {
+    return faultTolerant;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void ConnectionInfo::setFaultTolerant( bool faultTolerant ) {
+    this->faultTolerant = faultTolerant;
+}
+
+////////////////////////////////////////////////////////////////////////////////
 decaf::lang::Pointer<commands::Command> ConnectionInfo::visit( activemq::state::CommandVisitor* visitor ) 
     throw( activemq::exceptions::ActiveMQException ) {
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConnectionInfo.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConnectionInfo.h?rev=925834&r1=925833&r2=925834&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConnectionInfo.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConnectionInfo.h Sun Mar 21 17:30:56 2010
@@ -57,6 +57,7 @@ namespace commands{
         bool brokerMasterConnector;
         bool manageable;
         bool clientMaster;
+        bool faultTolerant;
 
     public:
 
@@ -140,6 +141,9 @@ namespace commands{
         virtual bool isClientMaster() const;
         virtual void setClientMaster( bool clientMaster );
 
+        virtual bool isFaultTolerant() const;
+        virtual void setFaultTolerant( bool faultTolerant );
+
         /**
          * @return an answer of true to the isConnectionInfo() query.
          */

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQSession.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQSession.cpp?rev=925834&r1=925833&r2=925834&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQSession.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQSession.cpp Sun Mar 21 17:30:56 2010
@@ -578,9 +578,7 @@ cms::BytesMessage* ActiveMQSession::crea
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-cms::BytesMessage* ActiveMQSession::createBytesMessage(
-    const unsigned char* bytes,
-    std::size_t bytesSize )
+cms::BytesMessage* ActiveMQSession::createBytesMessage( const unsigned char* bytes, int bytesSize )
         throw ( cms::CMSException ) {
 
     try{

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQSession.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQSession.h?rev=925834&r1=925833&r2=925834&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQSession.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQSession.h Sun Mar 21 17:30:56 2010
@@ -383,10 +383,8 @@ namespace core{
          *
          * @throws CMSException
          */
-        virtual cms::BytesMessage* createBytesMessage(
-            const unsigned char* bytes,
-            std::size_t bytesSize )
-                throw ( cms::CMSException );
+        virtual cms::BytesMessage* createBytesMessage( const unsigned char* bytes, int bytesSize )
+            throw ( cms::CMSException );
 
         /**
          * Creates a new StreamMessage

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/MarshallingSupport.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/MarshallingSupport.cpp?rev=925834&r1=925833&r2=925834&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/MarshallingSupport.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/MarshallingSupport.cpp Sun Mar 21 17:30:56 2010
@@ -62,9 +62,9 @@ void MarshallingSupport::writeString16( 
 
     try{
 
-        std::size_t strSize = value.length();
+        int strSize = (int)value.length();
 
-        if( strSize > (std::size_t)Short::MAX_VALUE ) {
+        if( strSize > Short::MAX_VALUE ) {
             throw IOException(
                 __FILE__, __LINE__,
                 "String size exceeds Short::MAX_VALUE and cannot be sent via Openwire." );
@@ -86,15 +86,15 @@ void MarshallingSupport::writeString32( 
 
     try{
 
-        std::size_t strSize = value.length();
+        int strSize = (int)value.length();
 
-        if( strSize > (std::size_t)Integer::MAX_VALUE ) {
+        if( strSize > Integer::MAX_VALUE ) {
             throw IOException(
                 __FILE__, __LINE__,
                 "String size exceeds Integer::MAX_VALUE and cannot be sent via Openwire." );
         }
 
-        dataOut.writeInt( (int)strSize );
+        dataOut.writeInt( strSize );
         if( strSize > 0 ) {
             dataOut.write( (unsigned char*)value.c_str(), strSize, 0, strSize );
         }

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/OpenWireFormat.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/OpenWireFormat.cpp?rev=925834&r1=925833&r2=925834&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/OpenWireFormat.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/OpenWireFormat.cpp Sun Mar 21 17:30:56 2010
@@ -229,7 +229,7 @@ void OpenWireFormat::marshal( const Poin
                 if( !sizePrefixDisabled ) {
                     looseOut->close();
                     dataOut->writeInt( (int)baos->size() );
-                    dataOut->write( baos->toByteArray(), baos->size(), 0, baos->size() );
+                    dataOut->write( baos->toByteArray(), (int)baos->size(), 0, (int)baos->size() );
 
                     // Delete allocated resource
                     delete baos;

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/BaseDataStreamMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/BaseDataStreamMarshaller.cpp?rev=925834&r1=925833&r2=925834&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/BaseDataStreamMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/BaseDataStreamMarshaller.cpp Sun Mar 21 17:30:56 2010
@@ -694,7 +694,7 @@ std::vector<unsigned char> BaseDataStrea
         if( bs->readBoolean() ) {
             int size = dataIn->readInt();
             data.resize( size );
-            dataIn->readFully( &data[0], data.size() );
+            dataIn->readFully( &data[0], (int)data.size() );
         }
 
         return data;
@@ -715,7 +715,7 @@ std::vector<unsigned char> BaseDataStrea
             int size = dataIn->readInt();
             std::vector<unsigned char> data;
             data.resize( size );
-            dataIn->readFully( &data[0], data.size() );
+            dataIn->readFully( &data[0], (int)data.size() );
             return data;
         }
 
@@ -736,7 +736,7 @@ std::vector<unsigned char> BaseDataStrea
     try{
         std::vector<unsigned char> data;
         data.resize( size );
-        dataIn->readFully( &data[0], data.size() );
+        dataIn->readFully( &data[0], (int)data.size() );
         return data;
     }
     AMQ_CATCH_RETHROW( IOException )
@@ -753,7 +753,7 @@ std::vector<unsigned char> BaseDataStrea
     try{
         std::vector<unsigned char> data;
         data.resize( size );
-        dataIn->readFully( &data[0], data.size() );
+        dataIn->readFully( &data[0], (int)data.size() );
         return data;
     }
     AMQ_CATCH_RETHROW( IOException )

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=925834&r1=925833&r2=925834&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 Sun Mar 21 17:30:56 2010
@@ -279,19 +279,20 @@ void PrimitiveTypesMarshaller::marshalPr
         } else if( value.getType() == PrimitiveValueNode::STRING_TYPE ) {
 
             std::string data = value.getString();
+            int size = (int)data.size();
 
             // is the string big??
-            if( data.size() == 0 ) {
+            if( size == 0 ) {
                 dataOut.writeByte( PrimitiveValueNode::STRING_TYPE );
-                dataOut.writeShort( (short)data.size() );
+                dataOut.writeShort( (short)size );
             } else if( data.size() > Short::MAX_VALUE / 4 ) {
                 dataOut.writeByte( PrimitiveValueNode::BIG_STRING_TYPE );
-                dataOut.writeInt( (int)data.size() );
-                dataOut.write( (unsigned char*)data.c_str(), data.length(), 0, data.length() );
+                dataOut.writeInt( size );
+                dataOut.write( (unsigned char*)data.c_str(), size, 0, size );
             } else {
                 dataOut.writeByte( PrimitiveValueNode::STRING_TYPE );
-                dataOut.writeShort( (short)data.size() );
-                dataOut.write( (unsigned char*)data.c_str(), data.length(), 0, data.length() );
+                dataOut.writeShort( (short)size );
+                dataOut.write( (unsigned char*)data.c_str(), size, 0, size );
             }
 
         } else if( value.getType() == PrimitiveValueNode::LIST_TYPE ) {

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v1/MessageMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v1/MessageMarshaller.cpp?rev=925834&r1=925833&r2=925834&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v1/MessageMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v1/MessageMarshaller.cpp Sun Mar 21 17:30:56 2010
@@ -167,11 +167,11 @@ void MessageMarshaller::tightMarshal2( O
         tightMarshalString2( info->getType(), dataOut, bs );
         if( bs->readBoolean() ) {
             dataOut->writeInt( (int)info->getContent().size() );
-            dataOut->write( (const unsigned char*)(&info->getContent()[0]), info->getContent().size(), 0, info->getContent().size() );
+            dataOut->write( (const unsigned char*)(&info->getContent()[0]), (int)info->getContent().size(), 0, (int)info->getContent().size() );
         }
         if( bs->readBoolean() ) {
             dataOut->writeInt( (int)info->getMarshalledProperties().size() );
-            dataOut->write( (const unsigned char*)(&info->getMarshalledProperties()[0]), info->getMarshalledProperties().size(), 0, info->getMarshalledProperties().size() );
+            dataOut->write( (const unsigned char*)(&info->getMarshalledProperties()[0]), (int)info->getMarshalledProperties().size(), 0, (int)info->getMarshalledProperties().size() );
         }
         tightMarshalNestedObject2( wireFormat, info->getDataStructure().get(), dataOut, bs );
         tightMarshalCachedObject2( wireFormat, info->getTargetConsumerId().get(), dataOut, bs );
@@ -273,12 +273,12 @@ void MessageMarshaller::looseMarshal( Op
         dataOut->write( info->getContent().size() != 0 );
         if( info->getContent().size() != 0 ) {
             dataOut->writeInt( (int)info->getContent().size() );
-            dataOut->write( (const unsigned char*)(&info->getContent()[0]), info->getContent().size(), 0, info->getContent().size() );
+            dataOut->write( (const unsigned char*)(&info->getContent()[0]), (int)info->getContent().size(), 0, (int)info->getContent().size() );
         }
         dataOut->write( info->getMarshalledProperties().size() != 0 );
         if( info->getMarshalledProperties().size() != 0 ) {
             dataOut->writeInt( (int)info->getMarshalledProperties().size() );
-            dataOut->write( (const unsigned char*)(&info->getMarshalledProperties()[0]), info->getMarshalledProperties().size(), 0, info->getMarshalledProperties().size() );
+            dataOut->write( (const unsigned char*)(&info->getMarshalledProperties()[0]), (int)info->getMarshalledProperties().size(), 0, (int)info->getMarshalledProperties().size() );
         }
         looseMarshalNestedObject( wireFormat, info->getDataStructure().get(), dataOut );
         looseMarshalCachedObject( wireFormat, info->getTargetConsumerId().get(), dataOut );

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v1/PartialCommandMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v1/PartialCommandMarshaller.cpp?rev=925834&r1=925833&r2=925834&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v1/PartialCommandMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v1/PartialCommandMarshaller.cpp Sun Mar 21 17:30:56 2010
@@ -98,7 +98,7 @@ void PartialCommandMarshaller::tightMars
         dataOut->writeInt( info->getCommandId() );
         if( bs->readBoolean() ) {
             dataOut->writeInt( (int)info->getData().size() );
-            dataOut->write( (const unsigned char*)(&info->getData()[0]), info->getData().size(), 0, info->getData().size() );
+            dataOut->write( (const unsigned char*)(&info->getData()[0]), (int)info->getData().size(), 0, (int)info->getData().size() );
         }
     }
     AMQ_CATCH_RETHROW( decaf::io::IOException )
@@ -135,7 +135,7 @@ void PartialCommandMarshaller::looseMars
         dataOut->write( info->getData().size() != 0 );
         if( info->getData().size() != 0 ) {
             dataOut->writeInt( (int)info->getData().size() );
-            dataOut->write( (const unsigned char*)(&info->getData()[0]), info->getData().size(), 0, info->getData().size() );
+            dataOut->write( (const unsigned char*)(&info->getData()[0]), (int)info->getData().size(), 0, (int)info->getData().size() );
         }
     }
     AMQ_CATCH_RETHROW( decaf::io::IOException )

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v1/WireFormatInfoMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v1/WireFormatInfoMarshaller.cpp?rev=925834&r1=925833&r2=925834&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v1/WireFormatInfoMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v1/WireFormatInfoMarshaller.cpp Sun Mar 21 17:30:56 2010
@@ -105,7 +105,7 @@ void WireFormatInfoMarshaller::tightMars
         dataOut->writeInt( info->getVersion() );
         if( bs->readBoolean() ) {
             dataOut->writeInt( (int)info->getMarshalledProperties().size() );
-            dataOut->write( (const unsigned char*)(&info->getMarshalledProperties()[0]), info->getMarshalledProperties().size(), 0, info->getMarshalledProperties().size() );
+            dataOut->write( (const unsigned char*)(&info->getMarshalledProperties()[0]), (int)info->getMarshalledProperties().size(), 0, (int)info->getMarshalledProperties().size() );
         }
         info->afterMarshal( wireFormat );
     }
@@ -148,7 +148,7 @@ void WireFormatInfoMarshaller::looseMars
         dataOut->write( info->getMarshalledProperties().size() != 0 );
         if( info->getMarshalledProperties().size() != 0 ) {
             dataOut->writeInt( (int)info->getMarshalledProperties().size() );
-            dataOut->write( (const unsigned char*)(&info->getMarshalledProperties()[0]), info->getMarshalledProperties().size(), 0, info->getMarshalledProperties().size() );
+            dataOut->write( (const unsigned char*)(&info->getMarshalledProperties()[0]), (int)info->getMarshalledProperties().size(), 0, (int)info->getMarshalledProperties().size() );
         }
         info->afterMarshal( wireFormat );
     }

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v1/XATransactionIdMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v1/XATransactionIdMarshaller.cpp?rev=925834&r1=925833&r2=925834&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v1/XATransactionIdMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v1/XATransactionIdMarshaller.cpp Sun Mar 21 17:30:56 2010
@@ -101,11 +101,11 @@ void XATransactionIdMarshaller::tightMar
         dataOut->writeInt( info->getFormatId() );
         if( bs->readBoolean() ) {
             dataOut->writeInt( (int)info->getGlobalTransactionId().size() );
-            dataOut->write( (const unsigned char*)(&info->getGlobalTransactionId()[0]), info->getGlobalTransactionId().size(), 0, info->getGlobalTransactionId().size() );
+            dataOut->write( (const unsigned char*)(&info->getGlobalTransactionId()[0]), (int)info->getGlobalTransactionId().size(), 0, (int)info->getGlobalTransactionId().size() );
         }
         if( bs->readBoolean() ) {
             dataOut->writeInt( (int)info->getBranchQualifier().size() );
-            dataOut->write( (const unsigned char*)(&info->getBranchQualifier()[0]), info->getBranchQualifier().size(), 0, info->getBranchQualifier().size() );
+            dataOut->write( (const unsigned char*)(&info->getBranchQualifier()[0]), (int)info->getBranchQualifier().size(), 0, (int)info->getBranchQualifier().size() );
         }
     }
     AMQ_CATCH_RETHROW( decaf::io::IOException )
@@ -143,12 +143,12 @@ void XATransactionIdMarshaller::looseMar
         dataOut->write( info->getGlobalTransactionId().size() != 0 );
         if( info->getGlobalTransactionId().size() != 0 ) {
             dataOut->writeInt( (int)info->getGlobalTransactionId().size() );
-            dataOut->write( (const unsigned char*)(&info->getGlobalTransactionId()[0]), info->getGlobalTransactionId().size(), 0, info->getGlobalTransactionId().size() );
+            dataOut->write( (const unsigned char*)(&info->getGlobalTransactionId()[0]), (int)info->getGlobalTransactionId().size(), 0, (int)info->getGlobalTransactionId().size() );
         }
         dataOut->write( info->getBranchQualifier().size() != 0 );
         if( info->getBranchQualifier().size() != 0 ) {
             dataOut->writeInt( (int)info->getBranchQualifier().size() );
-            dataOut->write( (const unsigned char*)(&info->getBranchQualifier()[0]), info->getBranchQualifier().size(), 0, info->getBranchQualifier().size() );
+            dataOut->write( (const unsigned char*)(&info->getBranchQualifier()[0]), (int)info->getBranchQualifier().size(), 0, (int)info->getBranchQualifier().size() );
         }
     }
     AMQ_CATCH_RETHROW( decaf::io::IOException )

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v2/MessageMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v2/MessageMarshaller.cpp?rev=925834&r1=925833&r2=925834&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v2/MessageMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v2/MessageMarshaller.cpp Sun Mar 21 17:30:56 2010
@@ -169,11 +169,11 @@ void MessageMarshaller::tightMarshal2( O
         tightMarshalString2( info->getType(), dataOut, bs );
         if( bs->readBoolean() ) {
             dataOut->writeInt( (int)info->getContent().size() );
-            dataOut->write( (const unsigned char*)(&info->getContent()[0]), info->getContent().size(), 0, info->getContent().size() );
+            dataOut->write( (const unsigned char*)(&info->getContent()[0]), (int)info->getContent().size(), 0, (int)info->getContent().size() );
         }
         if( bs->readBoolean() ) {
             dataOut->writeInt( (int)info->getMarshalledProperties().size() );
-            dataOut->write( (const unsigned char*)(&info->getMarshalledProperties()[0]), info->getMarshalledProperties().size(), 0, info->getMarshalledProperties().size() );
+            dataOut->write( (const unsigned char*)(&info->getMarshalledProperties()[0]), (int)info->getMarshalledProperties().size(), 0, (int)info->getMarshalledProperties().size() );
         }
         tightMarshalNestedObject2( wireFormat, info->getDataStructure().get(), dataOut, bs );
         tightMarshalCachedObject2( wireFormat, info->getTargetConsumerId().get(), dataOut, bs );
@@ -277,12 +277,12 @@ void MessageMarshaller::looseMarshal( Op
         dataOut->write( info->getContent().size() != 0 );
         if( info->getContent().size() != 0 ) {
             dataOut->writeInt( (int)info->getContent().size() );
-            dataOut->write( (const unsigned char*)(&info->getContent()[0]), info->getContent().size(), 0, info->getContent().size() );
+            dataOut->write( (const unsigned char*)(&info->getContent()[0]), (int)info->getContent().size(), 0, (int)info->getContent().size() );
         }
         dataOut->write( info->getMarshalledProperties().size() != 0 );
         if( info->getMarshalledProperties().size() != 0 ) {
             dataOut->writeInt( (int)info->getMarshalledProperties().size() );
-            dataOut->write( (const unsigned char*)(&info->getMarshalledProperties()[0]), info->getMarshalledProperties().size(), 0, info->getMarshalledProperties().size() );
+            dataOut->write( (const unsigned char*)(&info->getMarshalledProperties()[0]), (int)info->getMarshalledProperties().size(), 0, (int)info->getMarshalledProperties().size() );
         }
         looseMarshalNestedObject( wireFormat, info->getDataStructure().get(), dataOut );
         looseMarshalCachedObject( wireFormat, info->getTargetConsumerId().get(), dataOut );

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v2/PartialCommandMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v2/PartialCommandMarshaller.cpp?rev=925834&r1=925833&r2=925834&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v2/PartialCommandMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v2/PartialCommandMarshaller.cpp Sun Mar 21 17:30:56 2010
@@ -98,7 +98,7 @@ void PartialCommandMarshaller::tightMars
         dataOut->writeInt( info->getCommandId() );
         if( bs->readBoolean() ) {
             dataOut->writeInt( (int)info->getData().size() );
-            dataOut->write( (const unsigned char*)(&info->getData()[0]), info->getData().size(), 0, info->getData().size() );
+            dataOut->write( (const unsigned char*)(&info->getData()[0]), (int)info->getData().size(), 0, (int)info->getData().size() );
         }
     }
     AMQ_CATCH_RETHROW( decaf::io::IOException )
@@ -135,7 +135,7 @@ void PartialCommandMarshaller::looseMars
         dataOut->write( info->getData().size() != 0 );
         if( info->getData().size() != 0 ) {
             dataOut->writeInt( (int)info->getData().size() );
-            dataOut->write( (const unsigned char*)(&info->getData()[0]), info->getData().size(), 0, info->getData().size() );
+            dataOut->write( (const unsigned char*)(&info->getData()[0]), (int)info->getData().size(), 0, (int)info->getData().size() );
         }
     }
     AMQ_CATCH_RETHROW( decaf::io::IOException )

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v2/WireFormatInfoMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v2/WireFormatInfoMarshaller.cpp?rev=925834&r1=925833&r2=925834&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v2/WireFormatInfoMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v2/WireFormatInfoMarshaller.cpp Sun Mar 21 17:30:56 2010
@@ -105,7 +105,7 @@ void WireFormatInfoMarshaller::tightMars
         dataOut->writeInt( info->getVersion() );
         if( bs->readBoolean() ) {
             dataOut->writeInt( (int)info->getMarshalledProperties().size() );
-            dataOut->write( (const unsigned char*)(&info->getMarshalledProperties()[0]), info->getMarshalledProperties().size(), 0, info->getMarshalledProperties().size() );
+            dataOut->write( (const unsigned char*)(&info->getMarshalledProperties()[0]), (int)info->getMarshalledProperties().size(), 0, (int)info->getMarshalledProperties().size() );
         }
         info->afterMarshal( wireFormat );
     }
@@ -148,7 +148,7 @@ void WireFormatInfoMarshaller::looseMars
         dataOut->write( info->getMarshalledProperties().size() != 0 );
         if( info->getMarshalledProperties().size() != 0 ) {
             dataOut->writeInt( (int)info->getMarshalledProperties().size() );
-            dataOut->write( (const unsigned char*)(&info->getMarshalledProperties()[0]), info->getMarshalledProperties().size(), 0, info->getMarshalledProperties().size() );
+            dataOut->write( (const unsigned char*)(&info->getMarshalledProperties()[0]), (int)info->getMarshalledProperties().size(), 0, (int)info->getMarshalledProperties().size() );
         }
         info->afterMarshal( wireFormat );
     }

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v2/XATransactionIdMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v2/XATransactionIdMarshaller.cpp?rev=925834&r1=925833&r2=925834&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v2/XATransactionIdMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v2/XATransactionIdMarshaller.cpp Sun Mar 21 17:30:56 2010
@@ -101,11 +101,11 @@ void XATransactionIdMarshaller::tightMar
         dataOut->writeInt( info->getFormatId() );
         if( bs->readBoolean() ) {
             dataOut->writeInt( (int)info->getGlobalTransactionId().size() );
-            dataOut->write( (const unsigned char*)(&info->getGlobalTransactionId()[0]), info->getGlobalTransactionId().size(), 0, info->getGlobalTransactionId().size() );
+            dataOut->write( (const unsigned char*)(&info->getGlobalTransactionId()[0]), (int)info->getGlobalTransactionId().size(), 0, (int)info->getGlobalTransactionId().size() );
         }
         if( bs->readBoolean() ) {
             dataOut->writeInt( (int)info->getBranchQualifier().size() );
-            dataOut->write( (const unsigned char*)(&info->getBranchQualifier()[0]), info->getBranchQualifier().size(), 0, info->getBranchQualifier().size() );
+            dataOut->write( (const unsigned char*)(&info->getBranchQualifier()[0]), (int)info->getBranchQualifier().size(), 0, (int)info->getBranchQualifier().size() );
         }
     }
     AMQ_CATCH_RETHROW( decaf::io::IOException )
@@ -143,12 +143,12 @@ void XATransactionIdMarshaller::looseMar
         dataOut->write( info->getGlobalTransactionId().size() != 0 );
         if( info->getGlobalTransactionId().size() != 0 ) {
             dataOut->writeInt( (int)info->getGlobalTransactionId().size() );
-            dataOut->write( (const unsigned char*)(&info->getGlobalTransactionId()[0]), info->getGlobalTransactionId().size(), 0, info->getGlobalTransactionId().size() );
+            dataOut->write( (const unsigned char*)(&info->getGlobalTransactionId()[0]), (int)info->getGlobalTransactionId().size(), 0, (int)info->getGlobalTransactionId().size() );
         }
         dataOut->write( info->getBranchQualifier().size() != 0 );
         if( info->getBranchQualifier().size() != 0 ) {
             dataOut->writeInt( (int)info->getBranchQualifier().size() );
-            dataOut->write( (const unsigned char*)(&info->getBranchQualifier()[0]), info->getBranchQualifier().size(), 0, info->getBranchQualifier().size() );
+            dataOut->write( (const unsigned char*)(&info->getBranchQualifier()[0]), (int)info->getBranchQualifier().size(), 0, (int)info->getBranchQualifier().size() );
         }
     }
     AMQ_CATCH_RETHROW( decaf::io::IOException )

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v3/MessageMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v3/MessageMarshaller.cpp?rev=925834&r1=925833&r2=925834&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v3/MessageMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v3/MessageMarshaller.cpp Sun Mar 21 17:30:56 2010
@@ -186,11 +186,11 @@ void MessageMarshaller::tightMarshal2( O
         tightMarshalString2( info->getType(), dataOut, bs );
         if( bs->readBoolean() ) {
             dataOut->writeInt( (int)info->getContent().size() );
-            dataOut->write( (const unsigned char*)(&info->getContent()[0]), info->getContent().size(), 0, info->getContent().size() );
+            dataOut->write( (const unsigned char*)(&info->getContent()[0]), (int)info->getContent().size(), 0, (int)info->getContent().size() );
         }
         if( bs->readBoolean() ) {
             dataOut->writeInt( (int)info->getMarshalledProperties().size() );
-            dataOut->write( (const unsigned char*)(&info->getMarshalledProperties()[0]), info->getMarshalledProperties().size(), 0, info->getMarshalledProperties().size() );
+            dataOut->write( (const unsigned char*)(&info->getMarshalledProperties()[0]), (int)info->getMarshalledProperties().size(), 0, (int)info->getMarshalledProperties().size() );
         }
         tightMarshalNestedObject2( wireFormat, info->getDataStructure().get(), dataOut, bs );
         tightMarshalCachedObject2( wireFormat, info->getTargetConsumerId().get(), dataOut, bs );
@@ -311,12 +311,12 @@ void MessageMarshaller::looseMarshal( Op
         dataOut->write( info->getContent().size() != 0 );
         if( info->getContent().size() != 0 ) {
             dataOut->writeInt( (int)info->getContent().size() );
-            dataOut->write( (const unsigned char*)(&info->getContent()[0]), info->getContent().size(), 0, info->getContent().size() );
+            dataOut->write( (const unsigned char*)(&info->getContent()[0]), (int)info->getContent().size(), 0, (int)info->getContent().size() );
         }
         dataOut->write( info->getMarshalledProperties().size() != 0 );
         if( info->getMarshalledProperties().size() != 0 ) {
             dataOut->writeInt( (int)info->getMarshalledProperties().size() );
-            dataOut->write( (const unsigned char*)(&info->getMarshalledProperties()[0]), info->getMarshalledProperties().size(), 0, info->getMarshalledProperties().size() );
+            dataOut->write( (const unsigned char*)(&info->getMarshalledProperties()[0]), (int)info->getMarshalledProperties().size(), 0, (int)info->getMarshalledProperties().size() );
         }
         looseMarshalNestedObject( wireFormat, info->getDataStructure().get(), dataOut );
         looseMarshalCachedObject( wireFormat, info->getTargetConsumerId().get(), dataOut );

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v3/PartialCommandMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v3/PartialCommandMarshaller.cpp?rev=925834&r1=925833&r2=925834&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v3/PartialCommandMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v3/PartialCommandMarshaller.cpp Sun Mar 21 17:30:56 2010
@@ -98,7 +98,7 @@ void PartialCommandMarshaller::tightMars
         dataOut->writeInt( info->getCommandId() );
         if( bs->readBoolean() ) {
             dataOut->writeInt( (int)info->getData().size() );
-            dataOut->write( (const unsigned char*)(&info->getData()[0]), info->getData().size(), 0, info->getData().size() );
+            dataOut->write( (const unsigned char*)(&info->getData()[0]), (int)info->getData().size(), 0, (int)info->getData().size() );
         }
     }
     AMQ_CATCH_RETHROW( decaf::io::IOException )
@@ -135,7 +135,7 @@ void PartialCommandMarshaller::looseMars
         dataOut->write( info->getData().size() != 0 );
         if( info->getData().size() != 0 ) {
             dataOut->writeInt( (int)info->getData().size() );
-            dataOut->write( (const unsigned char*)(&info->getData()[0]), info->getData().size(), 0, info->getData().size() );
+            dataOut->write( (const unsigned char*)(&info->getData()[0]), (int)info->getData().size(), 0, (int)info->getData().size() );
         }
     }
     AMQ_CATCH_RETHROW( decaf::io::IOException )

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v3/WireFormatInfoMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v3/WireFormatInfoMarshaller.cpp?rev=925834&r1=925833&r2=925834&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v3/WireFormatInfoMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v3/WireFormatInfoMarshaller.cpp Sun Mar 21 17:30:56 2010
@@ -105,7 +105,7 @@ void WireFormatInfoMarshaller::tightMars
         dataOut->writeInt( info->getVersion() );
         if( bs->readBoolean() ) {
             dataOut->writeInt( (int)info->getMarshalledProperties().size() );
-            dataOut->write( (const unsigned char*)(&info->getMarshalledProperties()[0]), info->getMarshalledProperties().size(), 0, info->getMarshalledProperties().size() );
+            dataOut->write( (const unsigned char*)(&info->getMarshalledProperties()[0]), (int)info->getMarshalledProperties().size(), 0, (int)info->getMarshalledProperties().size() );
         }
         info->afterMarshal( wireFormat );
     }
@@ -148,7 +148,7 @@ void WireFormatInfoMarshaller::looseMars
         dataOut->write( info->getMarshalledProperties().size() != 0 );
         if( info->getMarshalledProperties().size() != 0 ) {
             dataOut->writeInt( (int)info->getMarshalledProperties().size() );
-            dataOut->write( (const unsigned char*)(&info->getMarshalledProperties()[0]), info->getMarshalledProperties().size(), 0, info->getMarshalledProperties().size() );
+            dataOut->write( (const unsigned char*)(&info->getMarshalledProperties()[0]), (int)info->getMarshalledProperties().size(), 0, (int)info->getMarshalledProperties().size() );
         }
         info->afterMarshal( wireFormat );
     }

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v3/XATransactionIdMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v3/XATransactionIdMarshaller.cpp?rev=925834&r1=925833&r2=925834&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v3/XATransactionIdMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v3/XATransactionIdMarshaller.cpp Sun Mar 21 17:30:56 2010
@@ -101,11 +101,11 @@ void XATransactionIdMarshaller::tightMar
         dataOut->writeInt( info->getFormatId() );
         if( bs->readBoolean() ) {
             dataOut->writeInt( (int)info->getGlobalTransactionId().size() );
-            dataOut->write( (const unsigned char*)(&info->getGlobalTransactionId()[0]), info->getGlobalTransactionId().size(), 0, info->getGlobalTransactionId().size() );
+            dataOut->write( (const unsigned char*)(&info->getGlobalTransactionId()[0]), (int)info->getGlobalTransactionId().size(), 0, (int)info->getGlobalTransactionId().size() );
         }
         if( bs->readBoolean() ) {
             dataOut->writeInt( (int)info->getBranchQualifier().size() );
-            dataOut->write( (const unsigned char*)(&info->getBranchQualifier()[0]), info->getBranchQualifier().size(), 0, info->getBranchQualifier().size() );
+            dataOut->write( (const unsigned char*)(&info->getBranchQualifier()[0]), (int)info->getBranchQualifier().size(), 0, (int)info->getBranchQualifier().size() );
         }
     }
     AMQ_CATCH_RETHROW( decaf::io::IOException )
@@ -143,12 +143,12 @@ void XATransactionIdMarshaller::looseMar
         dataOut->write( info->getGlobalTransactionId().size() != 0 );
         if( info->getGlobalTransactionId().size() != 0 ) {
             dataOut->writeInt( (int)info->getGlobalTransactionId().size() );
-            dataOut->write( (const unsigned char*)(&info->getGlobalTransactionId()[0]), info->getGlobalTransactionId().size(), 0, info->getGlobalTransactionId().size() );
+            dataOut->write( (const unsigned char*)(&info->getGlobalTransactionId()[0]), (int)info->getGlobalTransactionId().size(), 0, (int)info->getGlobalTransactionId().size() );
         }
         dataOut->write( info->getBranchQualifier().size() != 0 );
         if( info->getBranchQualifier().size() != 0 ) {
             dataOut->writeInt( (int)info->getBranchQualifier().size() );
-            dataOut->write( (const unsigned char*)(&info->getBranchQualifier()[0]), info->getBranchQualifier().size(), 0, info->getBranchQualifier().size() );
+            dataOut->write( (const unsigned char*)(&info->getBranchQualifier()[0]), (int)info->getBranchQualifier().size(), 0, (int)info->getBranchQualifier().size() );
         }
     }
     AMQ_CATCH_RETHROW( decaf::io::IOException )

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v4/MessageMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v4/MessageMarshaller.cpp?rev=925834&r1=925833&r2=925834&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v4/MessageMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v4/MessageMarshaller.cpp Sun Mar 21 17:30:56 2010
@@ -186,11 +186,11 @@ void MessageMarshaller::tightMarshal2( O
         tightMarshalString2( info->getType(), dataOut, bs );
         if( bs->readBoolean() ) {
             dataOut->writeInt( (int)info->getContent().size() );
-            dataOut->write( (const unsigned char*)(&info->getContent()[0]), info->getContent().size(), 0, info->getContent().size() );
+            dataOut->write( (const unsigned char*)(&info->getContent()[0]), (int)info->getContent().size(), 0, (int)info->getContent().size() );
         }
         if( bs->readBoolean() ) {
             dataOut->writeInt( (int)info->getMarshalledProperties().size() );
-            dataOut->write( (const unsigned char*)(&info->getMarshalledProperties()[0]), info->getMarshalledProperties().size(), 0, info->getMarshalledProperties().size() );
+            dataOut->write( (const unsigned char*)(&info->getMarshalledProperties()[0]), (int)info->getMarshalledProperties().size(), 0, (int)info->getMarshalledProperties().size() );
         }
         tightMarshalNestedObject2( wireFormat, info->getDataStructure().get(), dataOut, bs );
         tightMarshalCachedObject2( wireFormat, info->getTargetConsumerId().get(), dataOut, bs );
@@ -311,12 +311,12 @@ void MessageMarshaller::looseMarshal( Op
         dataOut->write( info->getContent().size() != 0 );
         if( info->getContent().size() != 0 ) {
             dataOut->writeInt( (int)info->getContent().size() );
-            dataOut->write( (const unsigned char*)(&info->getContent()[0]), info->getContent().size(), 0, info->getContent().size() );
+            dataOut->write( (const unsigned char*)(&info->getContent()[0]), (int)info->getContent().size(), 0, (int)info->getContent().size() );
         }
         dataOut->write( info->getMarshalledProperties().size() != 0 );
         if( info->getMarshalledProperties().size() != 0 ) {
             dataOut->writeInt( (int)info->getMarshalledProperties().size() );
-            dataOut->write( (const unsigned char*)(&info->getMarshalledProperties()[0]), info->getMarshalledProperties().size(), 0, info->getMarshalledProperties().size() );
+            dataOut->write( (const unsigned char*)(&info->getMarshalledProperties()[0]), (int)info->getMarshalledProperties().size(), 0, (int)info->getMarshalledProperties().size() );
         }
         looseMarshalNestedObject( wireFormat, info->getDataStructure().get(), dataOut );
         looseMarshalCachedObject( wireFormat, info->getTargetConsumerId().get(), dataOut );

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v4/PartialCommandMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v4/PartialCommandMarshaller.cpp?rev=925834&r1=925833&r2=925834&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v4/PartialCommandMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v4/PartialCommandMarshaller.cpp Sun Mar 21 17:30:56 2010
@@ -98,7 +98,7 @@ void PartialCommandMarshaller::tightMars
         dataOut->writeInt( info->getCommandId() );
         if( bs->readBoolean() ) {
             dataOut->writeInt( (int)info->getData().size() );
-            dataOut->write( (const unsigned char*)(&info->getData()[0]), info->getData().size(), 0, info->getData().size() );
+            dataOut->write( (const unsigned char*)(&info->getData()[0]), (int)info->getData().size(), 0, (int)info->getData().size() );
         }
     }
     AMQ_CATCH_RETHROW( decaf::io::IOException )
@@ -135,7 +135,7 @@ void PartialCommandMarshaller::looseMars
         dataOut->write( info->getData().size() != 0 );
         if( info->getData().size() != 0 ) {
             dataOut->writeInt( (int)info->getData().size() );
-            dataOut->write( (const unsigned char*)(&info->getData()[0]), info->getData().size(), 0, info->getData().size() );
+            dataOut->write( (const unsigned char*)(&info->getData()[0]), (int)info->getData().size(), 0, (int)info->getData().size() );
         }
     }
     AMQ_CATCH_RETHROW( decaf::io::IOException )

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v4/WireFormatInfoMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v4/WireFormatInfoMarshaller.cpp?rev=925834&r1=925833&r2=925834&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v4/WireFormatInfoMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v4/WireFormatInfoMarshaller.cpp Sun Mar 21 17:30:56 2010
@@ -105,7 +105,7 @@ void WireFormatInfoMarshaller::tightMars
         dataOut->writeInt( info->getVersion() );
         if( bs->readBoolean() ) {
             dataOut->writeInt( (int)info->getMarshalledProperties().size() );
-            dataOut->write( (const unsigned char*)(&info->getMarshalledProperties()[0]), info->getMarshalledProperties().size(), 0, info->getMarshalledProperties().size() );
+            dataOut->write( (const unsigned char*)(&info->getMarshalledProperties()[0]), (int)info->getMarshalledProperties().size(), 0, (int)info->getMarshalledProperties().size() );
         }
         info->afterMarshal( wireFormat );
     }
@@ -148,7 +148,7 @@ void WireFormatInfoMarshaller::looseMars
         dataOut->write( info->getMarshalledProperties().size() != 0 );
         if( info->getMarshalledProperties().size() != 0 ) {
             dataOut->writeInt( (int)info->getMarshalledProperties().size() );
-            dataOut->write( (const unsigned char*)(&info->getMarshalledProperties()[0]), info->getMarshalledProperties().size(), 0, info->getMarshalledProperties().size() );
+            dataOut->write( (const unsigned char*)(&info->getMarshalledProperties()[0]), (int)info->getMarshalledProperties().size(), 0, (int)info->getMarshalledProperties().size() );
         }
         info->afterMarshal( wireFormat );
     }

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v4/XATransactionIdMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v4/XATransactionIdMarshaller.cpp?rev=925834&r1=925833&r2=925834&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v4/XATransactionIdMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v4/XATransactionIdMarshaller.cpp Sun Mar 21 17:30:56 2010
@@ -101,11 +101,11 @@ void XATransactionIdMarshaller::tightMar
         dataOut->writeInt( info->getFormatId() );
         if( bs->readBoolean() ) {
             dataOut->writeInt( (int)info->getGlobalTransactionId().size() );
-            dataOut->write( (const unsigned char*)(&info->getGlobalTransactionId()[0]), info->getGlobalTransactionId().size(), 0, info->getGlobalTransactionId().size() );
+            dataOut->write( (const unsigned char*)(&info->getGlobalTransactionId()[0]), (int)info->getGlobalTransactionId().size(), 0, (int)info->getGlobalTransactionId().size() );
         }
         if( bs->readBoolean() ) {
             dataOut->writeInt( (int)info->getBranchQualifier().size() );
-            dataOut->write( (const unsigned char*)(&info->getBranchQualifier()[0]), info->getBranchQualifier().size(), 0, info->getBranchQualifier().size() );
+            dataOut->write( (const unsigned char*)(&info->getBranchQualifier()[0]), (int)info->getBranchQualifier().size(), 0, (int)info->getBranchQualifier().size() );
         }
     }
     AMQ_CATCH_RETHROW( decaf::io::IOException )
@@ -143,12 +143,12 @@ void XATransactionIdMarshaller::looseMar
         dataOut->write( info->getGlobalTransactionId().size() != 0 );
         if( info->getGlobalTransactionId().size() != 0 ) {
             dataOut->writeInt( (int)info->getGlobalTransactionId().size() );
-            dataOut->write( (const unsigned char*)(&info->getGlobalTransactionId()[0]), info->getGlobalTransactionId().size(), 0, info->getGlobalTransactionId().size() );
+            dataOut->write( (const unsigned char*)(&info->getGlobalTransactionId()[0]), (int)info->getGlobalTransactionId().size(), 0, (int)info->getGlobalTransactionId().size() );
         }
         dataOut->write( info->getBranchQualifier().size() != 0 );
         if( info->getBranchQualifier().size() != 0 ) {
             dataOut->writeInt( (int)info->getBranchQualifier().size() );
-            dataOut->write( (const unsigned char*)(&info->getBranchQualifier()[0]), info->getBranchQualifier().size(), 0, info->getBranchQualifier().size() );
+            dataOut->write( (const unsigned char*)(&info->getBranchQualifier()[0]), (int)info->getBranchQualifier().size(), 0, (int)info->getBranchQualifier().size() );
         }
     }
     AMQ_CATCH_RETHROW( decaf::io::IOException )

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v5/MessageMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v5/MessageMarshaller.cpp?rev=925834&r1=925833&r2=925834&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v5/MessageMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v5/MessageMarshaller.cpp Sun Mar 21 17:30:56 2010
@@ -186,11 +186,11 @@ void MessageMarshaller::tightMarshal2( O
         tightMarshalString2( info->getType(), dataOut, bs );
         if( bs->readBoolean() ) {
             dataOut->writeInt( (int)info->getContent().size() );
-            dataOut->write( (const unsigned char*)(&info->getContent()[0]), info->getContent().size(), 0, info->getContent().size() );
+            dataOut->write( (const unsigned char*)(&info->getContent()[0]), (int)info->getContent().size(), 0, (int)info->getContent().size() );
         }
         if( bs->readBoolean() ) {
             dataOut->writeInt( (int)info->getMarshalledProperties().size() );
-            dataOut->write( (const unsigned char*)(&info->getMarshalledProperties()[0]), info->getMarshalledProperties().size(), 0, info->getMarshalledProperties().size() );
+            dataOut->write( (const unsigned char*)(&info->getMarshalledProperties()[0]), (int)info->getMarshalledProperties().size(), 0, (int)info->getMarshalledProperties().size() );
         }
         tightMarshalNestedObject2( wireFormat, info->getDataStructure().get(), dataOut, bs );
         tightMarshalCachedObject2( wireFormat, info->getTargetConsumerId().get(), dataOut, bs );
@@ -311,12 +311,12 @@ void MessageMarshaller::looseMarshal( Op
         dataOut->write( info->getContent().size() != 0 );
         if( info->getContent().size() != 0 ) {
             dataOut->writeInt( (int)info->getContent().size() );
-            dataOut->write( (const unsigned char*)(&info->getContent()[0]), info->getContent().size(), 0, info->getContent().size() );
+            dataOut->write( (const unsigned char*)(&info->getContent()[0]), (int)info->getContent().size(), 0, (int)info->getContent().size() );
         }
         dataOut->write( info->getMarshalledProperties().size() != 0 );
         if( info->getMarshalledProperties().size() != 0 ) {
             dataOut->writeInt( (int)info->getMarshalledProperties().size() );
-            dataOut->write( (const unsigned char*)(&info->getMarshalledProperties()[0]), info->getMarshalledProperties().size(), 0, info->getMarshalledProperties().size() );
+            dataOut->write( (const unsigned char*)(&info->getMarshalledProperties()[0]), (int)info->getMarshalledProperties().size(), 0, (int)info->getMarshalledProperties().size() );
         }
         looseMarshalNestedObject( wireFormat, info->getDataStructure().get(), dataOut );
         looseMarshalCachedObject( wireFormat, info->getTargetConsumerId().get(), dataOut );

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v5/PartialCommandMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v5/PartialCommandMarshaller.cpp?rev=925834&r1=925833&r2=925834&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v5/PartialCommandMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v5/PartialCommandMarshaller.cpp Sun Mar 21 17:30:56 2010
@@ -98,7 +98,7 @@ void PartialCommandMarshaller::tightMars
         dataOut->writeInt( info->getCommandId() );
         if( bs->readBoolean() ) {
             dataOut->writeInt( (int)info->getData().size() );
-            dataOut->write( (const unsigned char*)(&info->getData()[0]), info->getData().size(), 0, info->getData().size() );
+            dataOut->write( (const unsigned char*)(&info->getData()[0]), (int)info->getData().size(), 0, (int)info->getData().size() );
         }
     }
     AMQ_CATCH_RETHROW( decaf::io::IOException )
@@ -135,7 +135,7 @@ void PartialCommandMarshaller::looseMars
         dataOut->write( info->getData().size() != 0 );
         if( info->getData().size() != 0 ) {
             dataOut->writeInt( (int)info->getData().size() );
-            dataOut->write( (const unsigned char*)(&info->getData()[0]), info->getData().size(), 0, info->getData().size() );
+            dataOut->write( (const unsigned char*)(&info->getData()[0]), (int)info->getData().size(), 0, (int)info->getData().size() );
         }
     }
     AMQ_CATCH_RETHROW( decaf::io::IOException )



Mime
View raw message