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/01/18 14:04:12 UTC
svn commit: r497423 - in
/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq:
connector/openwire/commands/ connector/openwire/marshal/
connector/stomp/commands/ util/
Author: tabish
Date: Thu Jan 18 05:04:11 2007
New Revision: 497423
URL: http://svn.apache.org/viewvc?view=rev&rev=497423
Log:
http://issues.apache.org/activemq/browse/AMQCPP-30
Modified:
incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQTempQueue.h
incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQTopic.h
incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/BaseDataStreamMarshaller.cpp
incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/BaseDataStreamMarshaller.h
incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/PrimitiveMapMarshaller.cpp
incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/StompMessage.h
incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/PrimitiveMap.cpp
incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/PrimitiveMap.h
Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQTempQueue.h
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQTempQueue.h?view=diff&rev=497423&r1=497422&r2=497423
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQTempQueue.h (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQTempQueue.h Thu Jan 18 05:04:11 2007
@@ -133,7 +133,7 @@
*/
virtual std::string getQueueName(void) const
throw( cms::CMSException ) {
- this->getPhysicalName();
+ return this->getPhysicalName();
}
};
Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQTopic.h
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQTopic.h?view=diff&rev=497423&r1=497422&r2=497423
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQTopic.h (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQTopic.h Thu Jan 18 05:04:11 2007
@@ -74,7 +74,7 @@
* @return The Destination Type
*/
virtual cms::Destination::DestinationType getDestinationType(void) const {
- cms::Destination::TOPIC;
+ return cms::Destination::TOPIC;
}
/**
Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/BaseDataStreamMarshaller.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/BaseDataStreamMarshaller.cpp?view=diff&rev=497423&r1=497422&r2=497423
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/BaseDataStreamMarshaller.cpp (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/BaseDataStreamMarshaller.cpp Thu Jan 18 05:04:11 2007
@@ -526,7 +526,7 @@
rc += 2;
- for( int i = 0; i < error->getStackTraceElements().size(); ++i ) {
+ for( unsigned int i = 0; i < error->getStackTraceElements().size(); ++i ) {
const BrokerError::StackTraceElement* element =
error->getStackTraceElements()[i];
@@ -802,7 +802,7 @@
{
std::string buffer = "";
- for( int i = 0; i < data.size(); i++ )
+ for( unsigned int i = 0; i < data.size(); i++ )
{
buffer.append( hexTable[ data[i] ] );
}
Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/BaseDataStreamMarshaller.h
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/BaseDataStreamMarshaller.h?view=diff&rev=497423&r1=497422&r2=497423
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/BaseDataStreamMarshaller.h (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/BaseDataStreamMarshaller.h Thu Jan 18 05:04:11 2007
@@ -523,7 +523,7 @@
int rc = 0;
bs->writeBoolean( true );
rc += 2;
- for( int i = 0; i < objects.size(); ++i ) {
+ for( unsigned int i = 0; i < objects.size(); ++i ) {
rc += tightMarshalNestedObject1(
wireFormat, objects[i], bs );
}
@@ -561,7 +561,7 @@
if( bs->readBoolean() ) {
dataOut->writeShort( (short)objects.size() );
- for( int i = 0; i < objects.size(); ++i ) {
+ for( unsigned int i = 0; i < objects.size(); ++i ) {
tightMarshalNestedObject2(
wireFormat, objects[i], dataOut, bs );
}
@@ -593,7 +593,7 @@
if( !objects.empty() ) {
dataOut->writeShort( (short)objects.size() );
- for( int i = 0; i < objects.size(); ++i ) {
+ for( unsigned int i = 0; i < objects.size(); ++i ) {
looseMarshalNestedObject(
wireFormat, objects[i], dataOut );
}
Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/PrimitiveMapMarshaller.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/PrimitiveMapMarshaller.cpp?view=diff&rev=497423&r1=497422&r2=497423
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/PrimitiveMapMarshaller.cpp (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/PrimitiveMapMarshaller.cpp Thu Jan 18 05:04:11 2007
@@ -308,4 +308,4 @@
}
-*/
\ No newline at end of file
+*/
Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/StompMessage.h
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/StompMessage.h?view=diff&rev=497423&r1=497422&r2=497423
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/StompMessage.h (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/StompMessage.h Thu Jan 18 05:04:11 2007
@@ -122,7 +122,7 @@
util::Properties& props = getFrame().getProperties();
std::vector< std::pair< std::string, std::string > > propArray = props.toArray();
- for( int ix=0; ix<propArray.size(); ++ix ){
+ for( unsigned int ix=0; ix<propArray.size(); ++ix ){
const std::string& name = propArray[ix].first;
@@ -143,7 +143,7 @@
const util::Properties& props = getFrame().getProperties();
std::vector< std::pair< std::string, std::string > > propArray = props.toArray();
- for( int ix=0; ix<propArray.size(); ++ix ){
+ for( unsigned int ix=0; ix<propArray.size(); ++ix ){
const std::string& name = propArray[ix].first;
Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/PrimitiveMap.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/PrimitiveMap.cpp?view=diff&rev=497423&r1=497422&r2=497423
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/PrimitiveMap.cpp (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/PrimitiveMap.cpp Thu Jan 18 05:04:11 2007
@@ -212,7 +212,7 @@
}
////////////////////////////////////////////////////////////////////////////////
-const PrimitiveMap::ValueNode& PrimitiveMap::getValue( const std::string& key ) const
+PrimitiveMap::ValueNode PrimitiveMap::getValue( const std::string& key ) const
throw ( activemq::exceptions::NoSuchElementException ) {
return valueNodeMap.getValue( key );
Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/PrimitiveMap.h
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/PrimitiveMap.h?view=diff&rev=497423&r1=497422&r2=497423
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/PrimitiveMap.h (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/PrimitiveMap.h Thu Jan 18 05:04:11 2007
@@ -350,7 +350,7 @@
* @returns the concrete Value
* @throws NoSuchElementException
*/
- const ValueNode& getValue( const std::string& key ) const
+ ValueNode getValue( const std::string& key ) const
throw( activemq::exceptions::NoSuchElementException );
};