activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r925834 [2/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
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v5/WireFormatInfoMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v5/WireFormatInfoMarshaller.cpp?rev=925834&r1=925833&r2=925834&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v5/WireFormatInfoMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v5/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/v5/XATransactionIdMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v5/XATransactionIdMarshaller.cpp?rev=925834&r1=925833&r2=925834&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v5/XATransactionIdMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v5/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/utils/BooleanStream.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/utils/BooleanStream.cpp?rev=925834&r1=925833&r2=925834&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/utils/BooleanStream.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/utils/BooleanStream.cpp Sun Mar 21 17:30:56 2010
@@ -155,7 +155,7 @@ void BooleanStream::unmarshal( DataInput
         data.resize( arrayLimit );
 
         // Make sure we get all the data we are expecting
-        dataIn->readFully( &data[0], data.size(), 0, arrayLimit );
+        dataIn->readFully( &data[0], (int)data.size(), 0, arrayLimit );
 
         clear();
     }

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/BytesMessage.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/BytesMessage.h?rev=925834&r1=925833&r2=925834&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/BytesMessage.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/BytesMessage.h Sun Mar 21 17:30:56 2010
@@ -79,7 +79,7 @@ namespace cms{
          * @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 ) = 0;
 
         /**
@@ -105,7 +105,7 @@ namespace cms{
          * @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 ) = 0;
 
         /**
@@ -196,7 +196,7 @@ namespace cms{
          * @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 ) = 0;
@@ -247,7 +247,7 @@ namespace cms{
          * @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 ) = 0;
@@ -267,7 +267,7 @@ namespace cms{
          *                        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 ) = 0;
 
         /**

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

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/StreamMessage.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/StreamMessage.h?rev=925834&r1=925833&r2=925834&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/StreamMessage.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/StreamMessage.h Sun Mar 21 17:30:56 2010
@@ -143,7 +143,7 @@ namespace cms {
          * @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,
@@ -194,7 +194,7 @@ namespace cms {
          * @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,
@@ -214,7 +214,7 @@ namespace cms {
          *                        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 ) = 0;
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/nio/ByteArrayBuffer.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/nio/ByteArrayBuffer.cpp?rev=925834&r1=925833&r2=925834&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/nio/ByteArrayBuffer.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/nio/ByteArrayBuffer.cpp Sun Mar 21 17:30:56 2010
@@ -313,7 +313,7 @@ long long ByteArrayBuffer::getLong() thr
     try{
 
         long long value = this->getLong( this->_position );
-        this->_position += sizeof(value);
+        this->_position += (int)sizeof(value);
         return value;
     }
     DECAF_CATCH_RETHROW( decaf::nio::BufferUnderflowException )
@@ -346,7 +346,7 @@ int ByteArrayBuffer::getInt() throw( dec
     try{
 
         int value = this->getInt( this->_position );
-        this->_position += sizeof(value);
+        this->_position += (int)sizeof(value);
         return value;
     }
     DECAF_CATCH_RETHROW( decaf::nio::BufferUnderflowException )
@@ -379,7 +379,7 @@ short ByteArrayBuffer::getShort() throw(
     try{
 
         short value = this->getShort( this->_position );
-        this->_position += sizeof(value);
+        this->_position += (int)sizeof(value);
         return value;
     }
     DECAF_CATCH_RETHROW( decaf::nio::BufferUnderflowException )
@@ -488,7 +488,7 @@ ByteArrayBuffer& ByteArrayBuffer::putDou
     try{
 
         this->putDouble( this->_position, value );
-        this->_position += sizeof(value);
+        this->_position += (int)sizeof(value);
         return *this;
     }
     DECAF_CATCH_RETHROW( decaf::nio::ReadOnlyBufferException )
@@ -520,7 +520,7 @@ ByteArrayBuffer& ByteArrayBuffer::putFlo
     try{
 
         this->putFloat( this->_position, value );
-        this->_position += sizeof(value);
+        this->_position += (int)sizeof(value);
         return *this;
     }
     DECAF_CATCH_RETHROW( decaf::nio::ReadOnlyBufferException )
@@ -552,7 +552,7 @@ ByteArrayBuffer& ByteArrayBuffer::putLon
     try{
 
         this->putLong( this->_position, value );
-        this->_position += sizeof(value);
+        this->_position += (int)sizeof(value);
         return *this;
     }
     DECAF_CATCH_RETHROW( decaf::nio::ReadOnlyBufferException )
@@ -591,7 +591,7 @@ ByteArrayBuffer& ByteArrayBuffer::putInt
     try{
 
         this->putInt( this->_position, value );
-        this->_position += sizeof(value);
+        this->_position += (int)sizeof(value);
         return *this;
     }
     DECAF_CATCH_RETHROW( decaf::nio::ReadOnlyBufferException )
@@ -630,7 +630,7 @@ ByteArrayBuffer& ByteArrayBuffer::putSho
     try{
 
         this->putShort( this->_position, value );
-        this->_position += sizeof(value);
+        this->_position += (int)sizeof(value);
         return *this;
     }
     DECAF_CATCH_RETHROW( decaf::nio::ReadOnlyBufferException )

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/nio/DoubleArrayBuffer.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/nio/DoubleArrayBuffer.cpp?rev=925834&r1=925833&r2=925834&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/nio/DoubleArrayBuffer.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/nio/DoubleArrayBuffer.cpp Sun Mar 21 17:30:56 2010
@@ -31,7 +31,7 @@ DoubleArrayBuffer::DoubleArrayBuffer( in
 
     // Allocate using the ByteArray, not read-only initially.  Take a reference to it.
     // The capacity is the given capacity times the size of the stored datatype
-    this->_array.reset( new ByteArrayAdapter( size * sizeof(double) ) );
+    this->_array.reset( new ByteArrayAdapter( size * (int)sizeof(double) ) );
     this->offset = 0;
     this->length = size;
     this->readOnly = readOnly;

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/nio/FloatArrayBuffer.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/nio/FloatArrayBuffer.cpp?rev=925834&r1=925833&r2=925834&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/nio/FloatArrayBuffer.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/nio/FloatArrayBuffer.cpp Sun Mar 21 17:30:56 2010
@@ -31,7 +31,7 @@ FloatArrayBuffer::FloatArrayBuffer( int 
 
     // Allocate using the ByteArray, not read-only initially.  Take a reference to it.
     // The capacity is the given capacity times the size of the stored datatype
-    this->_array.reset( new ByteArrayAdapter( size * sizeof(float) ) );
+    this->_array.reset( new ByteArrayAdapter( size * (int)sizeof(float) ) );
     this->offset = 0;
     this->length = size;
     this->readOnly = readOnly;

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/nio/IntArrayBuffer.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/nio/IntArrayBuffer.cpp?rev=925834&r1=925833&r2=925834&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/nio/IntArrayBuffer.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/nio/IntArrayBuffer.cpp Sun Mar 21 17:30:56 2010
@@ -31,7 +31,7 @@ IntArrayBuffer::IntArrayBuffer( int size
 
     // Allocate using the ByteArray, not read-only initially.  Take a reference to it.
     // The size is the given size times the size of the stored datatype
-    this->_array.reset( new ByteArrayAdapter( size * sizeof(int) ) );
+    this->_array.reset( new ByteArrayAdapter( size * (int)sizeof(int) ) );
     this->offset = 0;
     this->length = size;
     this->readOnly = readOnly;

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/nio/LongArrayBuffer.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/nio/LongArrayBuffer.cpp?rev=925834&r1=925833&r2=925834&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/nio/LongArrayBuffer.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/nio/LongArrayBuffer.cpp Sun Mar 21 17:30:56 2010
@@ -31,7 +31,7 @@ LongArrayBuffer::LongArrayBuffer( int si
 
     // Allocate using the ByteArray, not read-only initially.  Take a reference to it.
     // The capacity is the given capacity times the size of the stored datatype
-    this->_array.reset( new ByteArrayAdapter( size * sizeof(long long) ) );
+    this->_array.reset( new ByteArrayAdapter( size * (int)sizeof(long long) ) );
     this->offset = 0;
     this->length = size;
     this->readOnly = readOnly;

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/nio/ShortArrayBuffer.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/nio/ShortArrayBuffer.cpp?rev=925834&r1=925833&r2=925834&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/nio/ShortArrayBuffer.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/nio/ShortArrayBuffer.cpp Sun Mar 21 17:30:56 2010
@@ -31,7 +31,7 @@ ShortArrayBuffer::ShortArrayBuffer( int 
 
     // Allocate using the ByteArray, not read-only initially.  Take a reference to it.
     // The capacity is the given capacity times the size of the stored datatype
-    this->_array.reset( new ByteArrayAdapter( size * sizeof(short) ) );
+    this->_array.reset( new ByteArrayAdapter( size * (int)sizeof(short) ) );
     this->offset = 0;
     this->length = size;
     this->readOnly = readOnly;

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/util/ByteArrayAdapter.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/util/ByteArrayAdapter.cpp?rev=925834&r1=925833&r2=925834&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/util/ByteArrayAdapter.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/util/ByteArrayAdapter.cpp Sun Mar 21 17:30:56 2010
@@ -82,7 +82,7 @@ ByteArrayAdapter::ByteArrayAdapter( doub
 
     try{
         this->initialize( reinterpret_cast<unsigned char*>( array ),
-                          size * sizeof( double ), own );
+                          size * (int)sizeof( double ), own );
     }
     DECAF_CATCH_RETHROW( NullPointerException )
     DECAF_CATCH_RETHROW( IndexOutOfBoundsException )
@@ -96,7 +96,7 @@ ByteArrayAdapter::ByteArrayAdapter( floa
 
     try{
         this->initialize( reinterpret_cast<unsigned char*>( array ),
-                          size * sizeof( float ), own );
+                          size * (int)sizeof( float ), own );
     }
     DECAF_CATCH_RETHROW( NullPointerException )
     DECAF_CATCH_RETHROW( IndexOutOfBoundsException )
@@ -110,7 +110,7 @@ ByteArrayAdapter::ByteArrayAdapter( long
 
     try{
         this->initialize( reinterpret_cast<unsigned char*>( array ),
-                          size * sizeof( long long ), own );
+                          size * (int)sizeof( long long ), own );
     }
     DECAF_CATCH_RETHROW( NullPointerException )
     DECAF_CATCH_RETHROW( IndexOutOfBoundsException )
@@ -124,7 +124,7 @@ ByteArrayAdapter::ByteArrayAdapter( int*
 
     try{
         this->initialize( reinterpret_cast<unsigned char*>( array ),
-                          size * sizeof( int ), own );
+                          size * (int)sizeof( int ), own );
     }
     DECAF_CATCH_RETHROW( NullPointerException )
     DECAF_CATCH_RETHROW( IndexOutOfBoundsException )
@@ -138,7 +138,7 @@ ByteArrayAdapter::ByteArrayAdapter( shor
 
     try{
         this->initialize( reinterpret_cast<unsigned char*>( array ),
-                          size * sizeof( short ), own );
+                          size * (int)sizeof( short ), own );
     }
     DECAF_CATCH_RETHROW( NullPointerException )
     DECAF_CATCH_RETHROW( IndexOutOfBoundsException )

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/util/ByteArrayAdapter.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/util/ByteArrayAdapter.h?rev=925834&r1=925833&r2=925834&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/util/ByteArrayAdapter.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/util/ByteArrayAdapter.h Sun Mar 21 17:30:56 2010
@@ -227,7 +227,7 @@ namespace util{
          * @return the size the array.
          */
         virtual int getDoubleCapacity() const {
-            return this->size / sizeof( double );
+            return this->size / (int)sizeof( double );
         }
 
         /**
@@ -235,7 +235,7 @@ namespace util{
          * @return the size the array.
          */
         virtual int getFloatCapacity() const {
-            return this->size / sizeof( float );
+            return this->size / (int)sizeof( float );
         }
 
         /**
@@ -243,7 +243,7 @@ namespace util{
          * @return the size the array.
          */
         virtual int getLongCapacity() const {
-            return this->size / sizeof( long long );
+            return this->size / (int)sizeof( long long );
         }
 
         /**
@@ -251,7 +251,7 @@ namespace util{
          * @return the size the array.
          */
         virtual int getIntCapacity() const {
-            return this->size / sizeof( int );
+            return this->size / (int)sizeof( int );
         }
 
         /**
@@ -259,7 +259,7 @@ namespace util{
          * @return the size the array.
          */
         virtual int getShortCapacity() const {
-            return this->size / sizeof( short );
+            return this->size / (int)sizeof( short );
         }
 
         /**

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/ByteArrayInputStream.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/ByteArrayInputStream.cpp?rev=925834&r1=925833&r2=925834&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/ByteArrayInputStream.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/ByteArrayInputStream.cpp Sun Mar 21 17:30:56 2010
@@ -35,7 +35,7 @@ ByteArrayInputStream::ByteArrayInputStre
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-ByteArrayInputStream::ByteArrayInputStream( const unsigned char* buffer, int bufferSize )
+ByteArrayInputStream::ByteArrayInputStream( const unsigned char* buffer, long long bufferSize )
     throw( decaf::lang::exceptions::NullPointerException,
            decaf::lang::exceptions::IllegalArgumentException ) {
 
@@ -58,7 +58,7 @@ void ByteArrayInputStream::setBuffer( co
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void ByteArrayInputStream::setByteArray( const unsigned char* buffer, int bufferSize )
+void ByteArrayInputStream::setByteArray( const unsigned char* buffer, long long bufferSize )
     throw( decaf::lang::exceptions::NullPointerException,
            decaf::lang::exceptions::IllegalArgumentException ) {
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/ByteArrayInputStream.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/ByteArrayInputStream.h?rev=925834&r1=925833&r2=925834&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/ByteArrayInputStream.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/ByteArrayInputStream.h Sun Mar 21 17:30:56 2010
@@ -81,7 +81,7 @@ namespace io{
          * @throws NullPointerException if the buffer is Null.
          * @throws IllegalArguementException if the bufferSize is negative.
          */
-        ByteArrayInputStream( const unsigned char* buffer, int bufferSize )
+        ByteArrayInputStream( const unsigned char* buffer, long long bufferSize )
             throw( decaf::lang::exceptions::NullPointerException,
                    decaf::lang::exceptions::IllegalArgumentException );
 
@@ -112,7 +112,7 @@ namespace io{
          * @throws NullPointerException if the buffer is Null.
          * @throws IllegalArguementException if the bufferSize is negative.
          */
-        virtual void setByteArray( const unsigned char* buffer, int bufferSize )
+        virtual void setByteArray( const unsigned char* buffer, long long bufferSize )
             throw( decaf::lang::exceptions::NullPointerException,
                    decaf::lang::exceptions::IllegalArgumentException );
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/ByteArrayOutputStream.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/ByteArrayOutputStream.cpp?rev=925834&r1=925833&r2=925834&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/ByteArrayOutputStream.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/ByteArrayOutputStream.cpp Sun Mar 21 17:30:56 2010
@@ -146,7 +146,7 @@ void ByteArrayOutputStream::writeTo( Out
                 __FILE__, __LINE__, "Passed stream pointer is null" );
         }
 
-        out->write( this->toByteArray(), this->size() );
+        out->write( this->toByteArray(), (int)this->size() );
     }
     DECAF_CATCH_RETHROW( IOException )
     DECAF_CATCH_RETHROW( NullPointerException )

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/PriorityQueue.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/PriorityQueue.h?rev=925834&r1=925833&r2=925834&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/PriorityQueue.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/PriorityQueue.h Sun Mar 21 17:30:56 2010
@@ -435,7 +435,7 @@ namespace util {
                 capacity = 1;
                 elements = new E[capacity];
             } else {
-                capacity = (std::size_t) lang::Math::ceil( c.size() * 1.1 );
+                capacity = (std::size_t) lang::Math::ceil( (double)c.size() * 1.1 );
                 elements = new E[capacity];
             }
         }

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/zip/Adler32.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/zip/Adler32.cpp?rev=925834&r1=925833&r2=925834&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/zip/Adler32.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/zip/Adler32.cpp Sun Mar 21 17:30:56 2010
@@ -46,7 +46,7 @@ long long Adler32::getValue() const {
 
 ////////////////////////////////////////////////////////////////////////////////
 void Adler32::update( const std::vector<unsigned char>& buffer ) {
-    this->update( &buffer[0], buffer.size(), 0, buffer.size() );
+    this->update( &buffer[0], (int)buffer.size(), 0, (int)buffer.size() );
 }
 
 ////////////////////////////////////////////////////////////////////////////////

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/zip/CRC32.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/zip/CRC32.cpp?rev=925834&r1=925833&r2=925834&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/zip/CRC32.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/zip/CRC32.cpp Sun Mar 21 17:30:56 2010
@@ -46,7 +46,7 @@ long long CRC32::getValue() const {
 
 ////////////////////////////////////////////////////////////////////////////////
 void CRC32::update( const std::vector<unsigned char>& buffer ) {
-    this->update( &buffer[0], buffer.size(), 0, buffer.size() );
+    this->update( &buffer[0], (int)buffer.size(), 0, (int)buffer.size() );
 }
 
 ////////////////////////////////////////////////////////////////////////////////

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/zip/Deflater.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/zip/Deflater.cpp?rev=925834&r1=925833&r2=925834&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/zip/Deflater.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/zip/Deflater.cpp Sun Mar 21 17:30:56 2010
@@ -382,7 +382,7 @@ int Deflater::deflate( unsigned char* bu
                 __FILE__, __LINE__, "length parameter out of Bounds: %d.", length );
         }
 
-        int outStart = this->data->stream->total_out;
+        ulong outStart = this->data->stream->total_out;
 
         this->data->stream->next_out = buffer + offset;
         this->data->stream->avail_out = (uInt)length;
@@ -394,7 +394,7 @@ int Deflater::deflate( unsigned char* bu
             this->data->finished = true;
         }
 
-        return this->data->stream->total_out - outStart;
+        return (int)( this->data->stream->total_out - outStart );
     }
     DECAF_CATCH_RETHROW( NullPointerException )
     DECAF_CATCH_RETHROW( IllegalStateException )

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/zip/Inflater.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/zip/Inflater.cpp?rev=925834&r1=925833&r2=925834&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/zip/Inflater.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/zip/Inflater.cpp Sun Mar 21 17:30:56 2010
@@ -340,7 +340,7 @@ int Inflater::inflate( unsigned char* bu
                 __FILE__, __LINE__, "length parameter out of Bounds: %d.", length );
         }
 
-        int outStart = this->data->stream->total_out;
+        ulong outStart = this->data->stream->total_out;
 
         this->data->stream->next_out = buffer + offset;
         this->data->stream->avail_out = (uInt)length;
@@ -363,7 +363,7 @@ int Inflater::inflate( unsigned char* bu
                 __FILE__, __LINE__, "Inflate failed because a block of invalid data was found." );
         }
 
-        return this->data->stream->total_out - outStart;
+        return (int)( this->data->stream->total_out - outStart );
     }
     DECAF_CATCH_RETHROW( NullPointerException )
     DECAF_CATCH_RETHROW( IndexOutOfBoundsException )

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test-benchmarks/benchmark/PerformanceTimer.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test-benchmarks/benchmark/PerformanceTimer.h?rev=925834&r1=925833&r2=925834&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test-benchmarks/benchmark/PerformanceTimer.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test-benchmarks/benchmark/PerformanceTimer.h Sun Mar 21 17:30:56 2010
@@ -63,7 +63,7 @@ namespace benchmark{
          * Gets the number of runs made so far
          * @returns unsigned int that counts the number of runs
          */
-        unsigned int getNumberOfRuns() const {
+        unsigned long long getNumberOfRuns() const {
             return numberOfRuns;
         }
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test-benchmarks/decaf/io/ByteArrayInputStreamBenchmark.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test-benchmarks/decaf/io/ByteArrayInputStreamBenchmark.cpp?rev=925834&r1=925833&r2=925834&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test-benchmarks/decaf/io/ByteArrayInputStreamBenchmark.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test-benchmarks/decaf/io/ByteArrayInputStreamBenchmark.cpp Sun Mar 21 17:30:56 2010
@@ -63,7 +63,7 @@ void ByteArrayInputStreamBenchmark::run(
     for( int iy = 0; iy < numRuns; ++iy ){
 
         for( int iz = 0; iz < bufferSize; ++iz ) {
-            bucket[iy] = bis.read();
+            bucket[iy] = (unsigned char)bis.read();
         }
         bis.reset();
     }

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/activemq/test/openwire/OpenwireSimpleTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/activemq/test/openwire/OpenwireSimpleTest.cpp?rev=925834&r1=925833&r2=925834&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/activemq/test/openwire/OpenwireSimpleTest.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/activemq/test/openwire/OpenwireSimpleTest.cpp Sun Mar 21 17:30:56 2010
@@ -305,5 +305,5 @@ void OpenwireSimpleTest::tesstStreamMess
     CPPUNIT_ASSERT( rcvStreamMessage->readLong() == longValue );
     CPPUNIT_ASSERT( rcvStreamMessage->readFloat() == floatValue );
     CPPUNIT_ASSERT( rcvStreamMessage->readDouble() == doubleValue );
-    CPPUNIT_ASSERT( rcvStreamMessage->readBytes( readBytes ) == bytes.size() );
+    CPPUNIT_ASSERT( rcvStreamMessage->readBytes( readBytes ) == (int)bytes.size() );
 }

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

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/commands/ActiveMQBytesMessageTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/commands/ActiveMQBytesMessageTest.cpp?rev=925834&r1=925833&r2=925834&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/commands/ActiveMQBytesMessageTest.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/commands/ActiveMQBytesMessageTest.cpp Sun Mar 21 17:30:56 2010
@@ -32,11 +32,11 @@ using namespace decaf::lang;
 ////////////////////////////////////////////////////////////////////////////////
 void ActiveMQBytesMessageTest::testGetBodyLength() {
     ActiveMQBytesMessage msg;
-    std::size_t len = 10;
+    int len = 10;
 
     try {
 
-        for( std::size_t i = 0; i < len; i++ ) {
+        for( int i = 0; i < len; i++ ) {
             msg.writeLong( 5LL );
         }
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/commands/ActiveMQMapMessageTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/commands/ActiveMQMapMessageTest.cpp?rev=925834&r1=925833&r2=925834&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/commands/ActiveMQMapMessageTest.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/commands/ActiveMQMapMessageTest.cpp Sun Mar 21 17:30:56 2010
@@ -88,7 +88,7 @@ void ActiveMQMapMessageTest::testBytesCo
 
     bigString.reserve( 1024 * 1024 );
     for( int i = 0; i < 1024 * 1024; i++ ) {
-        bigString += ( (char)'a' + i % 26 );
+        bigString += (char)( (int)'a' + i % 26 );
     }
 
     msg.setString( "bigString", bigString );

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/commands/ActiveMQStreamMessageTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/commands/ActiveMQStreamMessageTest.cpp?rev=925834&r1=925833&r2=925834&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/commands/ActiveMQStreamMessageTest.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/commands/ActiveMQStreamMessageTest.cpp Sun Mar 21 17:30:56 2010
@@ -85,7 +85,7 @@ void ActiveMQStreamMessageTest::testSetA
     CPPUNIT_ASSERT( myMessage.readLong() == 0xFFFAAA33345LL );
     CPPUNIT_ASSERT( myMessage.readFloat() == 0.000012f );
     CPPUNIT_ASSERT( myMessage.readDouble() == 64.54654 );
-    CPPUNIT_ASSERT( myMessage.readBytes( readData ) == data.size() );
+    CPPUNIT_ASSERT( myMessage.readBytes( readData ) == (int)data.size() );
 }
 
 ////////////////////////////////////////////////////////////////////////////////

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/util/MarshallingSupportTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/util/MarshallingSupportTest.cpp?rev=925834&r1=925833&r2=925834&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/util/MarshallingSupportTest.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/util/MarshallingSupportTest.cpp Sun Mar 21 17:30:56 2010
@@ -193,7 +193,7 @@ void MarshallingSupportTest::testWriteSt
 
         MarshallingSupport::writeString( writer, "" );
 
-        bais.setByteArray( baos.toByteArray(), baos.size() );
+        bais.setByteArray( baos.toByteArray(), (int)baos.size() );
 
         CPPUNIT_ASSERT( dataIn.read() == PrimitiveValueNode::STRING_TYPE );
         CPPUNIT_ASSERT( dataIn.readShort() == 0 );
@@ -206,7 +206,7 @@ void MarshallingSupportTest::testWriteSt
 
         MarshallingSupport::writeString( writer, "Hello World" );
 
-        bais.setByteArray( baos.toByteArray(), baos.size() );
+        bais.setByteArray( baos.toByteArray(), (int)baos.size() );
 
         CPPUNIT_ASSERT( dataIn.read() == PrimitiveValueNode::STRING_TYPE );
         CPPUNIT_ASSERT( dataIn.readShort() == 11 );
@@ -219,7 +219,7 @@ void MarshallingSupportTest::testWriteSt
 
         MarshallingSupport::writeString( writer, std::string( Short::MAX_VALUE, 'A' ) );
 
-        bais.setByteArray( baos.toByteArray(), baos.size() );
+        bais.setByteArray( baos.toByteArray(), (int)baos.size() );
 
         CPPUNIT_ASSERT( dataIn.read() == PrimitiveValueNode::BIG_STRING_TYPE );
         CPPUNIT_ASSERT( dataIn.readInt() == Short::MAX_VALUE );
@@ -236,7 +236,7 @@ void MarshallingSupportTest::testWriteSt
         DataInputStream dataIn( &bais );
 
         MarshallingSupport::writeString16( writer, "Hello World" );
-        bais.setByteArray( baos.toByteArray(), baos.size() );
+        bais.setByteArray( baos.toByteArray(), (int)baos.size() );
 
         CPPUNIT_ASSERT( dataIn.readShort() == 11 );
     }
@@ -252,7 +252,7 @@ void MarshallingSupportTest::testWriteSt
         DataInputStream dataIn( &bais );
 
         MarshallingSupport::writeString32( writer, "Hello World" );
-        bais.setByteArray( baos.toByteArray(), baos.size() );
+        bais.setByteArray( baos.toByteArray(), (int)baos.size() );
 
         CPPUNIT_ASSERT( dataIn.readInt() == 11 );
     }
@@ -272,7 +272,7 @@ void MarshallingSupportTest::testReadStr
     MarshallingSupport::writeString( dataOut, testStr );
 
     // Move the output back to the input.
-    bytesIn.setByteArray( bytesOut.toByteArray(), bytesOut.size() );
+    bytesIn.setByteArray( bytesOut.toByteArray(), (int)bytesOut.size() );
 
     string resultStr = "";
     int type = dataIn.read();
@@ -300,7 +300,7 @@ void MarshallingSupportTest::testReadStr
     MarshallingSupport::writeString( dataOut, testStr );
 
     // Move the output back to the input.
-    bytesIn.setByteArray( bytesOut.toByteArray(), bytesOut.size() );
+    bytesIn.setByteArray( bytesOut.toByteArray(), (int)bytesOut.size() );
 
     string resultStr = "";
     int type = dataIn.read();

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/BaseDataStreamMarshallerTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/BaseDataStreamMarshallerTest.cpp?rev=925834&r1=925833&r2=925834&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/BaseDataStreamMarshallerTest.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/BaseDataStreamMarshallerTest.cpp Sun Mar 21 17:30:56 2010
@@ -84,7 +84,7 @@ void BaseDataStreamMarshallerTest::testL
     complexMarshaller->looseMarshal( &openWireFormat, dataStructure, &looseOut );
 
     // Now read it back in and make sure it's all right.
-    ByteArrayInputStream bais( baos.toByteArray(), baos.size() );
+    ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() );
     DataInputStream looseIn( &bais );
 
     unsigned char dataType = looseIn.readByte();
@@ -135,7 +135,7 @@ void BaseDataStreamMarshallerTest::testT
     complexMarshaller->tightMarshal2( &openWireFormat, dataStructure, &dataOut, &bs );
 
     // Now read it back in and make sure it's all right.
-    ByteArrayInputStream bais( baos.toByteArray(), baos.size() );
+    ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() );
     DataInputStream dataIn( &bais );
 
     unsigned char dataType = dataIn.readByte();

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/utils/BooleanStreamTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/utils/BooleanStreamTest.cpp?rev=925834&r1=925833&r2=925834&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/utils/BooleanStreamTest.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/utils/BooleanStreamTest.cpp Sun Mar 21 17:30:56 2010
@@ -51,7 +51,7 @@ void BooleanStreamTest::test() {
 
     BooleanStream b2Stream;
     decaf::io::ByteArrayInputStream baiStream( baoStream.toByteArray(),
-                                               baoStream.size() );
+                                               (int)baoStream.size() );
     decaf::io::DataInputStream daiStream( &baiStream );
 
     b2Stream.unmarshal( &daiStream );
@@ -85,7 +85,7 @@ void BooleanStreamTest::test2(){
 
     BooleanStream b2Stream;
     io::ByteArrayInputStream baiStream( baoStream.toByteArray(),
-                                        baoStream.size() );
+                                        (int)baoStream.size() );
     io::DataInputStream daiStream( &baiStream );
 
     b2Stream.unmarshal( &daiStream );

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/internal/nio/ByteArrayBufferTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/internal/nio/ByteArrayBufferTest.cpp?rev=925834&r1=925833&r2=925834&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/internal/nio/ByteArrayBufferTest.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/internal/nio/ByteArrayBufferTest.cpp Sun Mar 21 17:30:56 2010
@@ -749,8 +749,8 @@ void ByteArrayBufferTest::testGetDouble2
     }
     testBuffer1->clear();
 
-    std::size_t i = 0;
-    std::size_t j = 0;
+    int i = 0;
+    int j = 0;
 
     for( ; ( testBuffer1->capacity() - i ) >= (int)sizeof( double ); i += (int)sizeof( double ), j++ ) {
         CPPUNIT_ASSERT( testBuffer1->getDouble( i ) == values[j] );
@@ -776,7 +776,7 @@ void ByteArrayBufferTest::testPutDouble(
     testBuffer1->clear();
 
     for( int i = 0; testBuffer1->remaining() >= (int)sizeof( double );
-         i += sizeof( double ) ) {
+         i += (int)sizeof( double ) ) {
 
         testBuffer1->mark();
         testBuffer1->putDouble( i + 48.25136 );
@@ -804,7 +804,7 @@ void ByteArrayBufferTest::testPutDouble2
 
     testBuffer1->clear();
 
-    std::size_t i = 0;
+    int i = 0;
     for( ; ( testBuffer1->capacity() - i ) >= (int)sizeof( double ); i += (int)sizeof( double ) ) {
 
         testBuffer1->mark();
@@ -852,8 +852,8 @@ void ByteArrayBufferTest::testGetFloat2(
     }
     testBuffer1->clear();
 
-    std::size_t i = 0;
-    std::size_t j = 0;
+    int i = 0;
+    int j = 0;
 
     for( ; ( testBuffer1->capacity() - i ) >= (int)sizeof( float ); i += (int)sizeof( float ), j++ ) {
         CPPUNIT_ASSERT( testBuffer1->getFloat( i ) == values[j] );
@@ -879,13 +879,13 @@ void ByteArrayBufferTest::testPutFloat()
     testBuffer1->clear();
 
     for( int i = 0; testBuffer1->remaining() >= (int)sizeof( float );
-         i += sizeof( float ) ) {
+         i += (int)sizeof( float ) ) {
 
         testBuffer1->mark();
-        testBuffer1->putFloat( i + 48.25136f );
+        testBuffer1->putFloat( (float)i + 48.25136f );
         testBuffer1->reset();
         CPPUNIT_ASSERT( Float::floatToIntBits( testBuffer1->getFloat() ) ==
-                        Float::floatToIntBits( 48.25136f + i ) );
+                        Float::floatToIntBits( 48.25136f + (float)i ) );
     }
 
     CPPUNIT_ASSERT_THROW_MESSAGE(
@@ -907,14 +907,14 @@ void ByteArrayBufferTest::testPutFloat2(
 
     testBuffer1->clear();
 
-    std::size_t i = 0;
-    for( ; ( testBuffer1->capacity() - i ) >= (int)sizeof( float ); i += sizeof( float ) ) {
+    int i = 0;
+    for( ; ( testBuffer1->capacity() - i ) >= (int)sizeof( float ); i += (int)sizeof( float ) ) {
 
         testBuffer1->mark();
-        testBuffer1->putFloat( i, i + 99.99f );
+        testBuffer1->putFloat( i, (float)i + 99.99f );
         testBuffer1->reset();
         CPPUNIT_ASSERT( Float::floatToIntBits( testBuffer1->getFloat( i ) )==
-                        Float::floatToIntBits( 99.99f + i ) );
+                        Float::floatToIntBits( 99.99f + (float)i ) );
     }
 
     CPPUNIT_ASSERT_THROW_MESSAGE(
@@ -955,8 +955,8 @@ void ByteArrayBufferTest::testGetLong2()
     }
     testBuffer1->clear();
 
-    std::size_t i = 0;
-    std::size_t j = 0;
+    int i = 0;
+    int j = 0;
 
     for( ; ( testBuffer1->capacity() - i ) >= (int)sizeof( long long ); i += (int)sizeof( long long ), j++ ) {
         CPPUNIT_ASSERT( testBuffer1->getLong( i ) == values[j] );
@@ -982,7 +982,7 @@ void ByteArrayBufferTest::testPutLong() 
     testBuffer1->clear();
 
     for( int i = 0; testBuffer1->remaining() >= (int)sizeof( long long );
-         i += sizeof( long long ) ) {
+         i += (int)sizeof( long long ) ) {
 
         testBuffer1->mark();
         testBuffer1->putLong( i + 48 );
@@ -1009,7 +1009,7 @@ void ByteArrayBufferTest::testPutLong2()
 
     testBuffer1->clear();
 
-    std::size_t i = 0;
+    int i = 0;
     for( ; ( testBuffer1->capacity() - i ) >= (int)sizeof( long long ); i += (int)sizeof( long long ) ) {
 
         testBuffer1->mark();
@@ -1056,8 +1056,8 @@ void ByteArrayBufferTest::testGetInt2() 
     }
     testBuffer1->clear();
 
-    std::size_t i = 0;
-    std::size_t j = 0;
+    int i = 0;
+    int j = 0;
 
     for( ; ( testBuffer1->capacity() - i ) >= (int)sizeof( int ); i += (int)sizeof( int ), j++ ) {
         CPPUNIT_ASSERT( testBuffer1->getInt( i ) == values[j] );
@@ -1083,7 +1083,7 @@ void ByteArrayBufferTest::testPutInt() {
     testBuffer1->clear();
 
     for( int i = 0; testBuffer1->remaining() >= (int)sizeof( int );
-         i += sizeof( int ) ) {
+         i += (int)sizeof( int ) ) {
 
         testBuffer1->mark();
         testBuffer1->putInt( (int)i + 48 );
@@ -1110,8 +1110,8 @@ void ByteArrayBufferTest::testPutInt2() 
 
     testBuffer1->clear();
 
-    std::size_t i = 0;
-    for( ; ( testBuffer1->capacity() - i ) >= (int)sizeof( int ); i += sizeof( int ) ) {
+    int i = 0;
+    for( ; ( testBuffer1->capacity() - i ) >= (int)sizeof( int ); i += (int)sizeof( int ) ) {
 
         testBuffer1->mark();
         testBuffer1->putInt( i, (int)i + 99 );
@@ -1157,8 +1157,8 @@ void ByteArrayBufferTest::testGetShort2(
     }
     testBuffer1->clear();
 
-    std::size_t i = 0;
-    std::size_t j = 0;
+    int i = 0;
+    int j = 0;
 
     for( ; ( testBuffer1->capacity() - i ) >= (int)sizeof( short ); i += (int)sizeof( short ), j++ ) {
         CPPUNIT_ASSERT( testBuffer1->getShort( i ) == values[j] );
@@ -1184,7 +1184,7 @@ void ByteArrayBufferTest::testPutShort()
     testBuffer1->clear();
 
     for( int i = 0; testBuffer1->remaining() >= (int)sizeof( short );
-         i += sizeof( short ) ) {
+         i += (int)sizeof( short ) ) {
 
         testBuffer1->mark();
         testBuffer1->putShort( (short)( i + 48 ) );
@@ -1211,7 +1211,7 @@ void ByteArrayBufferTest::testPutShort2(
 
     testBuffer1->clear();
 
-    std::size_t i = 0;
+    int i = 0;
     for( ; ( testBuffer1->capacity() - i ) >= (int)sizeof( short ); i += (int)sizeof( short ) ) {
 
         testBuffer1->mark();

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/internal/nio/CharArrayBufferTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/internal/nio/CharArrayBufferTest.cpp?rev=925834&r1=925833&r2=925834&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/internal/nio/CharArrayBufferTest.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/internal/nio/CharArrayBufferTest.cpp Sun Mar 21 17:30:56 2010
@@ -826,10 +826,10 @@ void CharArrayBufferTest::testPutStringW
 
     CPPUNIT_ASSERT_THROW_MESSAGE(
         "Should throw a IndexOutOfBoundsException",
-        testBuffer1->put( str, str.length() + 1, str.length() + 2 ),
+        testBuffer1->put( str, (int)str.length() + 1, (int)str.length() + 2 ),
         IndexOutOfBoundsException );
 
-    testBuffer1->put( str, str.length(), str.length() );
+    testBuffer1->put( str, (int)str.length(), (int)str.length() );
     CPPUNIT_ASSERT( testBuffer1->position() == 0 );
 
     CPPUNIT_ASSERT_THROW_MESSAGE(
@@ -839,14 +839,14 @@ void CharArrayBufferTest::testPutStringW
 
     CPPUNIT_ASSERT_THROW_MESSAGE(
         "Should throw a IndexOutOfBoundsException",
-        testBuffer1->put( str, 2, str.length() + 1 ),
+        testBuffer1->put( str, 2, (int)str.length() + 1 ),
         IndexOutOfBoundsException );
 
     CPPUNIT_ASSERT( testBuffer1->position() == 0 );
 
     str.resize( testBuffer1->capacity() );
 
-    CharBuffer& ret = testBuffer1->put( str, 0, str.length() );
+    CharBuffer& ret = testBuffer1->put( str, 0, (int)str.length() );
     CPPUNIT_ASSERT( testBuffer1->position() == testBuffer1->capacity() );
 
     for( int ix = 0; ix < testBuffer1->capacity(); ++ix ) {

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/internal/nio/FloatArrayBufferTest.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/internal/nio/FloatArrayBufferTest.h?rev=925834&r1=925833&r2=925834&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/internal/nio/FloatArrayBufferTest.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/internal/nio/FloatArrayBufferTest.h Sun Mar 21 17:30:56 2010
@@ -113,7 +113,7 @@ namespace nio{
 
         void loadTestData2( float* array, int offset, int length ) {
             for( int i = 0; i < length; i++ ) {
-                array[offset + i] = (float)length - i;
+                array[offset + i] = (float)length - (float)i;
             }
         }
 
@@ -127,7 +127,7 @@ namespace nio{
         void loadTestData2( decaf::nio::FloatBuffer* buf ) {
             buf->clear();
             for( int i = 0; i < buf->capacity(); i++ ) {
-                buf->put(i, (float) buf->capacity() - i);
+                buf->put(i, (float) buf->capacity() - (float)i );
             }
         }
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/internal/nio/ShortArrayBufferTest.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/internal/nio/ShortArrayBufferTest.h?rev=925834&r1=925833&r2=925834&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/internal/nio/ShortArrayBufferTest.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/internal/nio/ShortArrayBufferTest.h Sun Mar 21 17:30:56 2010
@@ -154,7 +154,7 @@ namespace nio{
             short value = startValue;
             for( int i = 0; i < length; i++ ) {
                 CPPUNIT_ASSERT( buf->get( startIndex + i ) == value );
-                value = value + 1;
+                value = (short)( value + 1 );
             }
         }
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/internal/util/ByteArrayAdapterTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/internal/util/ByteArrayAdapterTest.cpp?rev=925834&r1=925833&r2=925834&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/internal/util/ByteArrayAdapterTest.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/internal/util/ByteArrayAdapterTest.cpp Sun Mar 21 17:30:56 2010
@@ -51,7 +51,7 @@ void ByteArrayAdapterTest::testRead(){
 
     unsigned char* data = new unsigned char[256];
     for( int i = 0; i < 256; ++i ) {
-        data[i] = i;
+        data[i] = (unsigned char)i;
     }
 
     ByteArrayAdapter array( data, 256 );
@@ -74,7 +74,7 @@ void ByteArrayAdapterTest::testWrite(){
 
     unsigned char* data = new unsigned char[256];
     for( int i = 0; i < 256; ++i ) {
-        data[i] = i;
+        data[i] = (unsigned char)i;
     }
 
     ByteArrayAdapter array( (int)256 );
@@ -130,7 +130,7 @@ void ByteArrayAdapterTest::testClear(){
 
     unsigned char* data = new unsigned char[256];
     for( int i = 0; i < 256; ++i ) {
-        data[i] = i;
+        data[i] = (unsigned char)i;
     }
 
     ByteArrayAdapter array( (int)256 );
@@ -161,7 +161,7 @@ void ByteArrayAdapterTest::testReszie(){
 
     unsigned char* data = new unsigned char[256];
     for( int i = 0; i < 256; ++i ) {
-        data[i] = i;
+        data[i] = (unsigned char)i;
     }
 
     ByteArrayAdapter array( (int)256 );
@@ -195,7 +195,7 @@ void ByteArrayAdapterTest::testOperators
 
     unsigned char* data = new unsigned char[256];
     for( int i = 0; i < 256; ++i ) {
-        data[i] = i;
+        data[i] = (unsigned char)i;
     }
 
     ByteArrayAdapter array( data, 256 );
@@ -214,7 +214,7 @@ void ByteArrayAdapterTest::testReadExcep
 
     unsigned char* data = new unsigned char[256];
     for( int i = 0; i < 256; ++i ) {
-        data[i] = i;
+        data[i] = (unsigned char)i;
     }
 
     ByteArrayAdapter array( data, 256, true );
@@ -240,7 +240,7 @@ void ByteArrayAdapterTest::testWriteExce
 
     unsigned char* data = new unsigned char[256];
     for( int i = 0; i < 256; ++i ) {
-        data[i] = i;
+        data[i] = (unsigned char)i;
     }
 
     ByteArrayAdapter array( data, 256, true );
@@ -263,7 +263,7 @@ void ByteArrayAdapterTest::testOperators
 
     unsigned char* data = new unsigned char[256];
     for( int i = 0; i < 256; ++i ) {
-        data[i] = i;
+        data[i] = (unsigned char)i;
     }
 
     ByteArrayAdapter array( data, 256, true );
@@ -279,7 +279,7 @@ void ByteArrayAdapterTest::testPut() {
     ByteArrayAdapter testBuffer1( testData1Size );
 
     int i = 0;
-    for( ; ( testBuffer1.getCapacity() - i ) >= (int)sizeof(unsigned char); i+=sizeof(unsigned char) ) {
+    for( ; ( testBuffer1.getCapacity() - i ) >= (int)sizeof(unsigned char); i += (int)sizeof(unsigned char) ) {
         testBuffer1.put( i, (unsigned char)(i + 99) );
         CPPUNIT_ASSERT( testBuffer1.get( i ) == (unsigned char)(i + 99) );
     }
@@ -296,7 +296,7 @@ void ByteArrayAdapterTest::testPutChar()
     ByteArrayAdapter testBuffer1( testData1Size );
 
     int i = 0;
-    for( ; ( testBuffer1.getCapacity() - i ) >= (int)sizeof(char); i+=sizeof(char) ) {
+    for( ; ( testBuffer1.getCapacity() - i ) >= (int)sizeof(char); i += (int)sizeof(char) ) {
         testBuffer1.putChar( i, (char)( i + 99 ) );
         CPPUNIT_ASSERT( testBuffer1.getChar( i ) == (char)(i + 99) );
     }
@@ -383,7 +383,7 @@ void ByteArrayAdapterTest::testPutFloat(
 
     int i = 0;
     for( ; i < testBuffer1.getFloatCapacity(); ++i  ) {
-        testBuffer1.putFloat( i, i + 99.025f );
+        testBuffer1.putFloat( i, (float)i + 99.025f );
         CPPUNIT_ASSERT( Float::floatToIntBits( testBuffer1.getFloat( i ) ) ==
                         Float::floatToIntBits( (float)(i + 99.025) ) );
     }

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/BufferedInputStreamTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/BufferedInputStreamTest.cpp?rev=925834&r1=925833&r2=925834&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/BufferedInputStreamTest.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/BufferedInputStreamTest.cpp Sun Mar 21 17:30:56 2010
@@ -167,7 +167,7 @@ namespace {
         virtual long long skip( long long num )
             throw ( io::IOException, lang::exceptions::UnsupportedOperationException ) {
 
-            return ( pos += std::min( num, (long long)available() ) );
+            return ( pos += (int)std::min( num, (long long)available() ) );
         }
 
     };
@@ -285,7 +285,7 @@ void BufferedInputStreamTest::testRead()
         // Create buffer with exact size of data
         BufferedInputStream is( &myStream, (int)(int)testStr.length() );
 
-        char c = is.read();
+        char c = (char)is.read();
         CPPUNIT_ASSERT_MESSAGE( "read returned incorrect char",
                                 c == testStr.at(0) );
     } catch( IOException& e ) {
@@ -379,25 +379,25 @@ void BufferedInputStreamTest::testSmalle
     int available = bufStream.available();
     CPPUNIT_ASSERT( available == (int)testStr.length() );
 
-    unsigned char dummy = bufStream.read();
+    unsigned char dummy = (unsigned char)bufStream.read();
     CPPUNIT_ASSERT( dummy == 'T' );
 
     available = bufStream.available();
     CPPUNIT_ASSERT( available == ((int)testStr.length() - 1) );
 
-    dummy = bufStream.read();
+    dummy = (unsigned char)bufStream.read();
     CPPUNIT_ASSERT( dummy == 'E' );
 
     available = bufStream.available();
     CPPUNIT_ASSERT( available == ((int)testStr.length() - 2 ) );
 
-    dummy = bufStream.read();
+    dummy = (unsigned char)bufStream.read();
     CPPUNIT_ASSERT( dummy == 'S' );
 
     available = bufStream.available();
     CPPUNIT_ASSERT( available == ((int)testStr.length() - 3 ) );
 
-    dummy = bufStream.read();
+    dummy = (unsigned char)bufStream.read();
     CPPUNIT_ASSERT( dummy == 'T' );
 
     unsigned char dummyBuf[20];
@@ -420,25 +420,25 @@ void BufferedInputStreamTest::testBigger
     int available = bufStream.available();
     CPPUNIT_ASSERT( available == (int)testStr.length() );
 
-    unsigned char dummy = bufStream.read();
+    unsigned char dummy = (unsigned char)bufStream.read();
     CPPUNIT_ASSERT( dummy == 'T' );
 
     available = bufStream.available();
     CPPUNIT_ASSERT( available == ((int)testStr.length() - 1 ) );
 
-    dummy = bufStream.read();
+    dummy = (unsigned char)bufStream.read();
     CPPUNIT_ASSERT( dummy == 'E' );
 
     available = bufStream.available();
     CPPUNIT_ASSERT( available == ((int)testStr.length() - 2 ) );
 
-    dummy = bufStream.read();
+    dummy = (unsigned char)bufStream.read();
     CPPUNIT_ASSERT( dummy == 'S' );
 
     available = bufStream.available();
     CPPUNIT_ASSERT( available == ((int)testStr.length() - 3 ) );
 
-    dummy = bufStream.read();
+    dummy = (unsigned char)bufStream.read();
     CPPUNIT_ASSERT( dummy == 'T' );
 
     unsigned char dummyBuf[20];
@@ -462,7 +462,7 @@ void BufferedInputStreamTest::testSkipNu
 void BufferedInputStreamTest::testMarkI() {
 
     ByteArrayInputStream stream;
-    stream.setByteArray( (const unsigned char*)testString.c_str(), testString.length() );
+    stream.setByteArray( (const unsigned char*)testString.c_str(), (int)testString.length() );
 
     BufferedInputStream is( &stream );
 
@@ -612,7 +612,7 @@ void BufferedInputStreamTest::testResetE
 void BufferedInputStreamTest::testReset() {
 
     ByteArrayInputStream stream;
-    stream.setByteArray( (const unsigned char*)testString.c_str(), testString.length() );
+    stream.setByteArray( (const unsigned char*)testString.c_str(), (int)testString.length() );
 
     BufferedInputStream is( &stream );
 
@@ -646,7 +646,7 @@ void BufferedInputStreamTest::testReset(
 void BufferedInputStreamTest::testSkipJ() {
 
     ByteArrayInputStream stream;
-    stream.setByteArray( (const unsigned char*)testString.c_str(), testString.length() );
+    stream.setByteArray( (const unsigned char*)testString.c_str(), (int)testString.length() );
 
     BufferedInputStream is( &stream );
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/BufferedOutputStreamTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/BufferedOutputStreamTest.cpp?rev=925834&r1=925833&r2=925834&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/BufferedOutputStreamTest.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/BufferedOutputStreamTest.cpp Sun Mar 21 17:30:56 2010
@@ -121,10 +121,10 @@ void BufferedOutputStreamTest::testWrite
 
         CPPUNIT_ASSERT_MESSAGE( "Bytes written, not buffered", NULL == baos.toByteArray() );
         os.flush();
-        ByteArrayInputStream bais2( baos.toByteArray(), baos.size() );
+        ByteArrayInputStream bais2( baos.toByteArray(), (int)baos.size() );
         CPPUNIT_ASSERT_MESSAGE( "Bytes not written after flush", 500 == bais2.available() );
-        os.write( (unsigned char*)&testString[500], testString.size(), 0, 514 );
-        ByteArrayInputStream bais3( baos.toByteArray(), baos.size() );
+        os.write( (unsigned char*)&testString[500], (int)testString.size(), 0, 514 );
+        ByteArrayInputStream bais3( baos.toByteArray(), (int)baos.size() );
         CPPUNIT_ASSERT_MESSAGE( "Bytes not written when buffer full",
                                 bais3.available() >= 1000);
         unsigned char wbytes[1014] = {0};
@@ -245,7 +245,7 @@ void BufferedOutputStreamTest::testWrite
         CPPUNIT_ASSERT_MESSAGE( "Byte written, not buffered", NULL == baos.toByteArray() );
         os.flush();
 
-        ByteArrayInputStream bais2( baos.toByteArray(), baos.size() );
+        ByteArrayInputStream bais2( baos.toByteArray(), (int)baos.size() );
         CPPUNIT_ASSERT_MESSAGE( "Byte not written after flush", 1 == bais2.available() );
         unsigned char wbytes[10];
         bais2.read( wbytes, 10, 0, 1 );

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/ByteArrayInputStreamTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/ByteArrayInputStreamTest.cpp?rev=925834&r1=925833&r2=925834&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/ByteArrayInputStreamTest.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/ByteArrayInputStreamTest.cpp Sun Mar 21 17:30:56 2010
@@ -211,21 +211,21 @@ void ByteArrayInputStreamTest::testStrea
     testBuffer.push_back('s');
     testBuffer.push_back('t');
 
-    ByteArrayInputStream stream_a(&testBuffer[0], testBuffer.size());
+    ByteArrayInputStream stream_a(&testBuffer[0], (int)testBuffer.size());
 
     CPPUNIT_ASSERT( stream_a.available() == 4 );
 
-    char a = stream_a.read();
-    char b = stream_a.read();
-    char c = stream_a.read();
-    char d = stream_a.read();
+    char a = (char)stream_a.read();
+    char b = (char)stream_a.read();
+    char c = (char)stream_a.read();
+    char d = (char)stream_a.read();
 
     CPPUNIT_ASSERT( a == 't' && b == 'e' && c == 's' && d == 't' );
     CPPUNIT_ASSERT( stream_a.available() == 0 );
 
     testBuffer.push_back('e');
 
-    stream_a.setByteArray(&testBuffer[0], testBuffer.size());
+    stream_a.setByteArray(&testBuffer[0], (int)testBuffer.size());
 
     CPPUNIT_ASSERT( stream_a.available() == 5 );
 
@@ -237,7 +237,7 @@ void ByteArrayInputStreamTest::testStrea
     CPPUNIT_ASSERT( std::string((const char*)buffer) == std::string("teste") );
     CPPUNIT_ASSERT( stream_a.available() == 0 );
 
-    stream_a.setByteArray(&testBuffer[0], testBuffer.size());
+    stream_a.setByteArray(&testBuffer[0], (int)testBuffer.size());
 
     memset(buffer, 0, 6);
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/ByteArrayOutputStreamTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/ByteArrayOutputStreamTest.cpp?rev=925834&r1=925833&r2=925834&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/ByteArrayOutputStreamTest.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/ByteArrayOutputStreamTest.cpp Sun Mar 21 17:30:56 2010
@@ -54,7 +54,7 @@ void ByteArrayOutputStreamTest::testClos
 ////////////////////////////////////////////////////////////////////////////////
 void ByteArrayOutputStreamTest::testReset() {
     ByteArrayOutputStream baos;
-    baos.write( (unsigned char*)&testString[0], testString.size(), 0, 100 );
+    baos.write( (unsigned char*)&testString[0], (int)testString.size(), 0, 100 );
     baos.reset();
     CPPUNIT_ASSERT_MESSAGE("reset failed", 0 == baos.size() );
 }
@@ -62,7 +62,7 @@ void ByteArrayOutputStreamTest::testRese
 ////////////////////////////////////////////////////////////////////////////////
 void ByteArrayOutputStreamTest::testSize() {
     ByteArrayOutputStream baos;
-    baos.write( (unsigned char*)&testString[0], testString.size(), 0, 100 );
+    baos.write( (unsigned char*)&testString[0], (int)testString.size(), 0, 100 );
     CPPUNIT_ASSERT_MESSAGE("size test failed", 100 == baos.size());
     baos.reset();
     CPPUNIT_ASSERT_MESSAGE("size test failed", 0 == baos.size());
@@ -72,7 +72,7 @@ void ByteArrayOutputStreamTest::testSize
 void ByteArrayOutputStreamTest::testToByteArray() {
     const unsigned char* bytes = NULL;
     ByteArrayOutputStream baos;
-    baos.write( (unsigned char*)&testString[0], testString.size(), 0, testString.length() );
+    baos.write( (unsigned char*)&testString[0], (int)testString.size(), 0, (int)testString.length() );
     bytes = baos.toByteArray();
     for( std::size_t i = 0; i < testString.length(); i++) {
         CPPUNIT_ASSERT_MESSAGE("Error in byte array", bytes[i] == testString.at(i) );
@@ -83,7 +83,7 @@ void ByteArrayOutputStreamTest::testToBy
 void ByteArrayOutputStreamTest::testToString() {
 
     ByteArrayOutputStream baos;
-    baos.write( (unsigned char*)&testString[0], testString.size(), 0, testString.length() );
+    baos.write( (unsigned char*)&testString[0], (int)testString.size(), 0, (int)testString.length() );
     CPPUNIT_ASSERT_MESSAGE( "Returned incorrect String",
                             baos.toString() == testString );
 }
@@ -101,7 +101,7 @@ void ByteArrayOutputStreamTest::testWrit
 ////////////////////////////////////////////////////////////////////////////////
 void ByteArrayOutputStreamTest::testWrite2() {
     ByteArrayOutputStream baos;
-    baos.write( (unsigned char*)&testString[0], testString.size(), 0, 100 );
+    baos.write( (unsigned char*)&testString[0], (int)testString.size(), 0, 100 );
     const unsigned char* bytes = baos.toByteArray();
     CPPUNIT_ASSERT_MESSAGE("Wrote incorrect bytes",
             string((const char*)bytes, baos.size() ) == testString.substr(0, 100) );
@@ -110,7 +110,7 @@ void ByteArrayOutputStreamTest::testWrit
 ////////////////////////////////////////////////////////////////////////////////
 void ByteArrayOutputStreamTest::testWrite3() {
     ByteArrayOutputStream baos;
-    baos.write( (unsigned char*)&testString[0], testString.size(), 50, 100 );
+    baos.write( (unsigned char*)&testString[0], (int)testString.size(), 50, 100 );
     const unsigned char* bytes = baos.toByteArray();
     CPPUNIT_ASSERT_MESSAGE("Wrote incorrect bytes",
             string((const char*)bytes, baos.size() ) == testString.substr(50, 100) );
@@ -120,7 +120,7 @@ void ByteArrayOutputStreamTest::testWrit
 void ByteArrayOutputStreamTest::testWriteToDecaf_io_OutputStream() {
     ByteArrayOutputStream baos1;
     ByteArrayOutputStream baos2;
-    baos1.write( (unsigned char*)&testString[0], testString.size(), 0, 100 );
+    baos1.write( (unsigned char*)&testString[0], (int)testString.size(), 0, 100 );
     baos1.writeTo( &baos2 );
     CPPUNIT_ASSERT_MESSAGE( "Returned incorrect String",
                             baos2.toString() == testString.substr(0, 100) );

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/DataInputStreamTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/DataInputStreamTest.cpp?rev=925834&r1=925833&r2=925834&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/DataInputStreamTest.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/DataInputStreamTest.cpp Sun Mar 21 17:30:56 2010
@@ -63,7 +63,7 @@ void DataInputStreamTest::testRead1() {
         openDataInputStream();
         std::vector<unsigned char> result;
         result.resize( testData.length() );
-        is->read( &result[0], testData.length() );
+        is->read( &result[0], (int)testData.length() );
         CPPUNIT_ASSERT_MESSAGE( "Incorrect data read",
             string( (const char*)&result[0], result.size() ) == testData );
     } catch( IOException &e ) {
@@ -81,9 +81,9 @@ void DataInputStreamTest::testRead2() {
         os->close();
         openDataInputStream();
         unsigned char* result = new unsigned char[ testData.length() ];
-        is->read( result, testData.length(), 0, testData.length() );
+        is->read( result, (int)testData.length(), 0, (int)testData.length() );
         CPPUNIT_ASSERT_MESSAGE("Incorrect data read",
-            string( (const char*)result, testData.size() ) == testData );
+            string( (const char*)result, (int)testData.size() ) == testData );
         delete [] result;
     } catch( IOException &e ) {
         CPPUNIT_FAIL("IOException during read test : " + e.getMessage());
@@ -156,12 +156,12 @@ void DataInputStreamTest::test_readFloat
 void DataInputStreamTest::test_readFully1() {
 
     std::vector<unsigned char> temp( testData.begin(), testData.end() );
-    os->write( &temp[0], temp.size() );
+    os->write( &temp[0], (int)temp.size() );
     os->close();
     openDataInputStream();
     std::vector<unsigned char> result;
     result.resize( testData.length() );
-    is->readFully( &result[0], testData.length() );
+    is->readFully( &result[0], (int)testData.length() );
 
     string expected = "";
     for( size_t ix = 0; ix < result.size(); ++ix ) {
@@ -180,10 +180,10 @@ void DataInputStreamTest::test_readFully
 void DataInputStreamTest::test_readFully2() {
 
     std::vector<unsigned char> temp( testData.begin(), testData.end() );
-    os->write( &temp[0], temp.size() );
+    os->write( &temp[0], (int)temp.size() );
     openDataInputStream();
     unsigned char* rbytes = new unsigned char[ testData.length() ];
-    is->readFully( rbytes, testData.length() );
+    is->readFully( rbytes, (int)testData.length() );
 
     string expected = "";
     for( size_t ix = 0; ix < testData.length(); ++ix ) {
@@ -194,36 +194,36 @@ void DataInputStreamTest::test_readFully
 
     CPPUNIT_ASSERT_THROW_MESSAGE(
         "should throw IndexOutOfBoundsException",
-        is->readFully( &temp[0], temp.size(), -1, -1 ),
+        is->readFully( &temp[0], (int)temp.size(), -1, -1 ),
         IndexOutOfBoundsException );
 
     CPPUNIT_ASSERT_THROW_MESSAGE(
         "should throw IndexOutOfBoundsException",
-        is->readFully( &temp[0], temp.size(), 0, -1 ),
+        is->readFully( &temp[0], (int)temp.size(), 0, -1 ),
         IndexOutOfBoundsException );
 
     CPPUNIT_ASSERT_THROW_MESSAGE(
         "should throw IndexOutOfBoundsException",
-        is->readFully( &temp[0], temp.size(), 1, -1 ),
+        is->readFully( &temp[0], (int)temp.size(), 1, -1 ),
         IndexOutOfBoundsException );
 
-    is->readFully( &temp[0], temp.size(), -1, 0 );
-    is->readFully( &temp[0], temp.size(), 0, 0 );
-    is->readFully( &temp[0], temp.size(), 1, 0 );
+    is->readFully( &temp[0], (int)temp.size(), -1, 0 );
+    is->readFully( &temp[0], (int)temp.size(), 0, 0 );
+    is->readFully( &temp[0], (int)temp.size(), 1, 0 );
 
     CPPUNIT_ASSERT_THROW_MESSAGE(
         "should throw IndexOutOfBoundsException",
-        is->readFully( &temp[0], temp.size(), -1, 1 ),
+        is->readFully( &temp[0], (int)temp.size(), -1, 1 ),
         IndexOutOfBoundsException );
 
     CPPUNIT_ASSERT_THROW_MESSAGE(
         "should throw IndexOutOfBoundsException",
-        is->readFully( &temp[0], temp.size(), 0, Integer::MAX_VALUE ),
+        is->readFully( &temp[0], (int)temp.size(), 0, Integer::MAX_VALUE ),
         IndexOutOfBoundsException );
 
     CPPUNIT_ASSERT_THROW_MESSAGE(
         "should throw IndexOutOfBoundsException",
-        is->readFully( &temp[0], temp.size(), 1, Integer::MAX_VALUE ),
+        is->readFully( &temp[0], (int)temp.size(), 1, Integer::MAX_VALUE ),
         IndexOutOfBoundsException );
 
     delete [] rbytes;
@@ -261,22 +261,22 @@ void DataInputStreamTest::test_readFully
     DataInputStream is(NULL);
     unsigned char* byteArray = new unsigned char[testData.length()];
 
-    is.readFully( byteArray, testData.length(), 0, 0 );
-    is.readFully( byteArray, testData.length(), 1, 0 );
+    is.readFully( byteArray, (int)testData.length(), 0, 0 );
+    is.readFully( byteArray, (int)testData.length(), 1, 0 );
 
     CPPUNIT_ASSERT_THROW_MESSAGE(
         "should throw NullPointerException",
-        is.readFully( byteArray, testData.length(), 1, 1 ),
+        is.readFully( byteArray, (int)testData.length(), 1, 1 ),
         NullPointerException );
 
     CPPUNIT_ASSERT_THROW_MESSAGE(
         "should throw NullPointerException",
-        is.readFully( byteArray, testData.length(), 0, 1 ),
+        is.readFully( byteArray, (int)testData.length(), 0, 1 ),
         NullPointerException );
 
     CPPUNIT_ASSERT_THROW_MESSAGE(
         "should throw NullPointerException",
-        is.readFully( byteArray, testData.length(), 0, Integer::MAX_VALUE ),
+        is.readFully( byteArray, (int)testData.length(), 0, Integer::MAX_VALUE ),
         NullPointerException );
 
     delete [] byteArray;
@@ -367,7 +367,7 @@ void DataInputStreamTest::test_readUnsig
 void DataInputStreamTest::test_skipBytes() {
     try {
         std::vector<unsigned char> temp( testData.begin(), testData.end() );
-        os->write( &temp[0], temp.size() );
+        os->write( &temp[0], (int)temp.size() );
         os->close();
         openDataInputStream();
         is->skip( 100 );

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/DataInputStreamTest.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/DataInputStreamTest.h?rev=925834&r1=925833&r2=925834&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/DataInputStreamTest.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/DataInputStreamTest.h Sun Mar 21 17:30:56 2010
@@ -116,7 +116,7 @@ namespace io{
                          unsigned char* expect, int expectLength );
 
         void openDataInputStream() {
-            this->bais.reset( new ByteArrayInputStream( baos->toByteArray(), baos->size() ) );
+            this->bais.reset( new ByteArrayInputStream( baos->toByteArray(), (int)baos->size() ) );
             this->is.reset( new DataInputStream( bais.get() ) );
         }
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/DataOutputStreamTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/DataOutputStreamTest.cpp?rev=925834&r1=925833&r2=925834&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/DataOutputStreamTest.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/DataOutputStreamTest.cpp Sun Mar 21 17:30:56 2010
@@ -49,7 +49,7 @@ void DataOutputStreamTest::testFlush() {
 void DataOutputStreamTest::testSize() {
 
     try {
-        os->write( (unsigned char*)&testData[0], testData.size(), 0, 150 );
+        os->write( (unsigned char*)&testData[0], (int)testData.size(), 0, 150 );
         os->close();
         openDataInputStream();
         unsigned char rbuf[150];
@@ -65,7 +65,7 @@ void DataOutputStreamTest::testSize() {
 void DataOutputStreamTest::testWrite1() {
 
     try {
-        os->write( (unsigned char*)&testData[0], testData.size(), 0, 150 );
+        os->write( (unsigned char*)&testData[0], (int)testData.size(), 0, 150 );
         os->close();
         openDataInputStream();
         unsigned char* rbuf = new unsigned char[150];
@@ -131,7 +131,7 @@ void DataOutputStreamTest::testWriteByte
         os->close();
         openDataInputStream();
         std::vector<unsigned char> result( testData.size() );
-        is->read( &result[0], testData.size() );
+        is->read( &result[0], (int)testData.size() );
         is->close();
         CPPUNIT_ASSERT_MESSAGE("Incorrect bytes written",
             string( (const char*)&result[0], result.size() ) == testData );
@@ -166,7 +166,7 @@ void DataOutputStreamTest::testWriteChar
         os->close();
         openDataInputStream();
         std::vector<unsigned char> result( testData.size() );
-        is->read( &result[0], testData.size() );
+        is->read( &result[0], (int)testData.size() );
         is->close();
         CPPUNIT_ASSERT_MESSAGE("Incorrect bytes written",
             string( (const char*)&result[0], result.size() ) == testData );
@@ -376,35 +376,35 @@ void DataOutputStreamTest::test(){
 
     unsigned char tempByte = buffer[ix];
     CPPUNIT_ASSERT( tempByte == byteVal );
-    ix += sizeof( tempByte );
+    ix += (int)sizeof( tempByte );
 
     unsigned short tempShort = 0;
     memcpy( &tempShort, buffer+ix, sizeof( unsigned short ) );
     tempShort = util::Endian::byteSwap( tempShort );
     CPPUNIT_ASSERT( tempShort == shortVal );
-    ix += sizeof( tempShort );
+    ix += (int)sizeof( tempShort );
 
     unsigned int tempInt = 0;
     memcpy( &tempInt, buffer+ix, sizeof( unsigned int ) );
     tempInt = util::Endian::byteSwap( tempInt );
     CPPUNIT_ASSERT( tempInt == intVal );
-    ix += sizeof( tempInt );
+    ix += (int)sizeof( tempInt );
 
     unsigned long long tempLong = 0;
     memcpy( &tempLong, buffer+ix, sizeof( unsigned long long ) );
     tempLong = util::Endian::byteSwap( tempLong );
     CPPUNIT_ASSERT( tempLong == longVal );
-    ix += sizeof( tempLong );
+    ix += (int)sizeof( tempLong );
 
     float tempFloat = 0;
     memcpy( &tempFloat, buffer+ix, sizeof( float ) );
     tempFloat = util::Endian::byteSwap( tempFloat );
     CPPUNIT_ASSERT( tempFloat == floatVal );
-    ix += sizeof( tempFloat );
+    ix += (int)sizeof( tempFloat );
 
     double tempDouble = 0;
     memcpy( &tempDouble, buffer+ix, sizeof( double ) );
     tempDouble = util::Endian::byteSwap( tempDouble );
     CPPUNIT_ASSERT( tempDouble == doubleVal );
-    ix += sizeof( tempDouble );
+    ix += (int)sizeof( tempDouble );
 }

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/FilterInputStreamTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/FilterInputStreamTest.cpp?rev=925834&r1=925833&r2=925834&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/FilterInputStreamTest.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/FilterInputStreamTest.cpp Sun Mar 21 17:30:56 2010
@@ -71,7 +71,7 @@ namespace {
             this->closed = true;
         }
         virtual long long skip( long long num ) throw ( io::IOException, lang::exceptions::UnsupportedOperationException ) {
-            return ( pos += std::min( num, (long long)available() ) );
+            return ( pos += (int)std::min( num, (long long)available() ) );
         }
 
     protected:
@@ -172,7 +172,7 @@ void FilterInputStreamTest::testRead() {
     MyInputStream myStream( testStr );
     FilterInputStream is( &myStream );
 
-    char c = is.read();
+    char c = (char)is.read();
     CPPUNIT_ASSERT_MESSAGE( "read returned incorrect char",
                             c == testStr.at(0) );
 }

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/FilterOutputStreamTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/FilterOutputStreamTest.cpp?rev=925834&r1=925833&r2=925834&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/FilterOutputStreamTest.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/FilterOutputStreamTest.cpp Sun Mar 21 17:30:56 2010
@@ -44,7 +44,7 @@ void FilterOutputStreamTest::testClose()
     try {
         ByteArrayOutputStream baos;
         FilterOutputStream os( &baos );
-        os.write( (unsigned char*)&testString[0], testString.size(), 0, 500 );
+        os.write( (unsigned char*)&testString[0], (int)testString.size(), 0, 500 );
         os.flush();
         CPPUNIT_ASSERT_MESSAGE( "Bytes not written after flush",
                                 500 == baos.size() );
@@ -60,7 +60,7 @@ void FilterOutputStreamTest::testFlush()
     try {
         ByteArrayOutputStream baos;
         FilterOutputStream os( &baos );
-        os.write( (unsigned char*)&testString[0], testString.size(), 0, 500 );
+        os.write( (unsigned char*)&testString[0], (int)testString.size(), 0, 500 );
         os.flush();
         CPPUNIT_ASSERT_MESSAGE( "Bytes not written after flush",
                                 500 == baos.size() );
@@ -76,13 +76,13 @@ void FilterOutputStreamTest::testWrite1(
     try {
         ByteArrayOutputStream baos;
         FilterOutputStream os( &baos );
-        os.write( (unsigned char*)&testString[0], testString.size(), 0, testString.size() );
+        os.write( (unsigned char*)&testString[0], (int)testString.size(), 0, (int)testString.size() );
         ByteArrayInputStream bais( baos.toByteArray(), baos.size() );
         os.flush();
         CPPUNIT_ASSERT_MESSAGE( "Bytes not written after flush",
                                 bais.available() == (int)testString.length() );
         unsigned char* wbytes = new unsigned char[ testString.length() ];
-        bais.read( wbytes, testString.length(), 0, testString.length() );
+        bais.read( wbytes, (int)testString.length(), 0, (int)testString.length() );
         CPPUNIT_ASSERT_MESSAGE("Incorrect bytes written",
             testString == string( (const char*)wbytes, testString.length() ) );
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/InputStreamReaderTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/InputStreamReaderTest.cpp?rev=925834&r1=925833&r2=925834&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/InputStreamReaderTest.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/InputStreamReaderTest.cpp Sun Mar 21 17:30:56 2010
@@ -95,7 +95,7 @@ void InputStreamReaderTest::testRead() {
     CPPUNIT_ASSERT_EQUAL( ' ', (char) this->reader1->read() );
 
     std::vector<char> buffer( TEST_STRING.length() - 5 );
-    this->reader1->read( &buffer[0], buffer.size(), 0, TEST_STRING.length() - 5 );
+    this->reader1->read( &buffer[0], (int)buffer.size(), 0, (int)TEST_STRING.length() - 5 );
     CPPUNIT_ASSERT_EQUAL( -1, this->reader1->read() );
 
     this->reader1->close();



Mime
View raw message