You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ta...@apache.org on 2007/02/10 23:20:35 UTC
svn commit: r505777 - in
/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2:
MessageMarshaller.cpp PartialCommandMarshaller.cpp
WireFormatInfoMarshaller.cpp XATransactionIdMarshaller.cpp
Author: tabish
Date: Sat Feb 10 14:20:34 2007
New Revision: 505777
URL: http://svn.apache.org/viewvc?view=rev&rev=505777
Log:
http://issues.apache.org/activemq/browse/AMQCPP-30
Modified:
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/MessageMarshaller.cpp
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/PartialCommandMarshaller.cpp
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/WireFormatInfoMarshaller.cpp
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/XATransactionIdMarshaller.cpp
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/MessageMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/MessageMarshaller.cpp?view=diff&rev=505777&r1=505776&r2=505777
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/MessageMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/MessageMarshaller.cpp Sat Feb 10 14:20:34 2007
@@ -111,9 +111,9 @@
rc += tightMarshalLong1( wireFormat, info->getTimestamp(), bs );
rc += tightMarshalString1( info->getType(), bs );
bs->writeBoolean( info->getContent().size() != 0 );
- rc += info->getContent().size() == 0 ? 0 : info->getContent().size() + 4;
+ rc += info->getContent().size() == 0 ? 0 : (int)info->getContent().size() + 4;
bs->writeBoolean( info->getMarshalledProperties().size() != 0 );
- rc += info->getMarshalledProperties().size() == 0 ? 0 : info->getMarshalledProperties().size() + 4;
+ rc += info->getMarshalledProperties().size() == 0 ? 0 : (int)info->getMarshalledProperties().size() + 4;
rc += tightMarshalNestedObject1( wireFormat, info->getDataStructure(), bs );
rc += tightMarshalCachedObject1( wireFormat, info->getTargetConsumerId(), bs );
bs->writeBoolean( info->isCompressed() );
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/PartialCommandMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/PartialCommandMarshaller.cpp?view=diff&rev=505777&r1=505776&r2=505777
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/PartialCommandMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/PartialCommandMarshaller.cpp Sat Feb 10 14:20:34 2007
@@ -64,7 +64,7 @@
int rc = BaseDataStreamMarshaller::tightMarshal1( wireFormat, dataStructure, bs );
bs->writeBoolean( info->getData().size() != 0 );
- rc += info->getData().size() == 0 ? 0 : info->getData().size() + 4;
+ rc += info->getData().size() == 0 ? 0 : (int)info->getData().size() + 4;
return rc + 4;
}
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/WireFormatInfoMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/WireFormatInfoMarshaller.cpp?view=diff&rev=505777&r1=505776&r2=505777
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/WireFormatInfoMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/WireFormatInfoMarshaller.cpp Sat Feb 10 14:20:34 2007
@@ -70,7 +70,7 @@
info->beforeMarshal( wireFormat );
int rc = BaseDataStreamMarshaller::tightMarshal1( wireFormat, dataStructure, bs );
bs->writeBoolean( info->getMarshalledProperties().size() != 0 );
- rc += info->getMarshalledProperties().size() == 0 ? 0 : info->getMarshalledProperties().size() + 4;
+ rc += info->getMarshalledProperties().size() == 0 ? 0 : (int)info->getMarshalledProperties().size() + 4;
return rc + 12;
}
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/XATransactionIdMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/XATransactionIdMarshaller.cpp?view=diff&rev=505777&r1=505776&r2=505777
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/XATransactionIdMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/XATransactionIdMarshaller.cpp Sat Feb 10 14:20:34 2007
@@ -65,9 +65,9 @@
int rc = TransactionIdMarshaller::tightMarshal1( wireFormat, dataStructure, bs );
bs->writeBoolean( info->getGlobalTransactionId().size() != 0 );
- rc += info->getGlobalTransactionId().size() == 0 ? 0 : info->getGlobalTransactionId().size() + 4;
+ rc += info->getGlobalTransactionId().size() == 0 ? 0 : (int)info->getGlobalTransactionId().size() + 4;
bs->writeBoolean( info->getBranchQualifier().size() != 0 );
- rc += info->getBranchQualifier().size() == 0 ? 0 : info->getBranchQualifier().size() + 4;
+ rc += info->getBranchQualifier().size() == 0 ? 0 : (int)info->getBranchQualifier().size() + 4;
return rc + 4;
}