Author: tabish
Date: Mon Mar 8 14:58:58 2010
New Revision: 920339
URL: http://svn.apache.org/viewvc?rev=920339&view=rev
Log:
Fix some compiler warnings.
Modified:
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQBytesMessage.cpp
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConnection.cpp
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/PrimitiveTypesMarshaller.cpp
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=920339&r1=920338&r2=920339&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
Mon Mar 8 14:58:58 2010
@@ -627,7 +627,7 @@
DataOutputStream doBuffer( &buffer );
// Start by writing the length of the written data before
compression.
- doBuffer.writeInt( this->length );
+ doBuffer.writeInt( (int)this->length );
// Now write the Compressed bytes.
this->bytesOut->writeTo( &doBuffer );
Modified:
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConnection.cpp
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConnection.cpp?rev=920339&r1=920338&r2=920339&view=diff
==============================================================================
---
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConnection.cpp
(original)
+++
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConnection.cpp
Mon Mar 8 14:58:58 2010
@@ -572,7 +572,7 @@
////////////////////////////////////////////////////////////////////////////////
void ActiveMQConnection::transportInterrupted() {
- transportInterruptionProcessingComplete.reset( new CountDownLatch(
dispatchers.size() ) );
+ transportInterruptionProcessingComplete.reset( new CountDownLatch(
(int)dispatchers.size() ) );
synchronized( &activeSessions ) {
std::auto_ptr< Iterator<ActiveMQSession*> > iter(
this->activeSessions.iterator() );
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=920339&r1=920338&r2=920339&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
Mon Mar 8 14:58:58 2010
@@ -80,7 +80,7 @@
}
///////////////////////////////////////////////////////////////////////////////
-void PrimitiveTypesMarshaller::marshal( const util::PrimitiveList* list,
std::vector<unsigned char>& buffer )
+void PrimitiveTypesMarshaller::marshal( const PrimitiveList* list,
std::vector<unsigned char>& buffer )
throw ( decaf::lang::Exception ) {
try {
@@ -99,7 +99,7 @@
}
///////////////////////////////////////////////////////////////////////////////
-void PrimitiveTypesMarshaller::unmarshal( util::PrimitiveList* list, const
std::vector<unsigned char>& buffer )
+void PrimitiveTypesMarshaller::unmarshal( PrimitiveList* list, const
std::vector<unsigned char>& buffer )
throw ( decaf::lang::Exception ) {
try {