activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r1460467 [10/15] - in /activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq: commands/ wireformat/openwire/marshal/generated/
Date Sun, 24 Mar 2013 21:30:56 GMT
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ConsumerInfoMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ConsumerInfoMarshaller.cpp?rev=1460467&r1=1460466&r2=1460467&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ConsumerInfoMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ConsumerInfoMarshaller.cpp Sun Mar 24 21:30:52 2013
@@ -51,235 +51,235 @@ unsigned char ConsumerInfoMarshaller::ge
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void ConsumerInfoMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) {
+void ConsumerInfoMarshaller::tightUnmarshal(OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs) {
 
     try {
 
-        BaseCommandMarshaller::tightUnmarshal( wireFormat, dataStructure, dataIn, bs );
+        BaseCommandMarshaller::tightUnmarshal(wireFormat, dataStructure, dataIn, bs);
 
         ConsumerInfo* info =
-            dynamic_cast<ConsumerInfo*>( dataStructure );
+            dynamic_cast<ConsumerInfo*>(dataStructure);
 
         int wireVersion = wireFormat->getVersion();
 
-        info->setConsumerId( Pointer<ConsumerId>( dynamic_cast< ConsumerId* >(
-            tightUnmarshalCachedObject( wireFormat, dataIn, bs ) ) ) );
-        info->setBrowser( bs->readBoolean() );
-        info->setDestination( Pointer<ActiveMQDestination>( dynamic_cast< ActiveMQDestination* >(
-            tightUnmarshalCachedObject( wireFormat, dataIn, bs ) ) ) );
-        info->setPrefetchSize( dataIn->readInt() );
-        info->setMaximumPendingMessageLimit( dataIn->readInt() );
-        info->setDispatchAsync( bs->readBoolean() );
-        info->setSelector( tightUnmarshalString( dataIn, bs ) );
-        info->setSubscriptionName( tightUnmarshalString( dataIn, bs ) );
-        info->setNoLocal( bs->readBoolean() );
-        info->setExclusive( bs->readBoolean() );
-        info->setRetroactive( bs->readBoolean() );
-        info->setPriority( dataIn->readByte() );
+        info->setConsumerId(Pointer<ConsumerId>(dynamic_cast<ConsumerId* >(
+            tightUnmarshalCachedObject(wireFormat, dataIn, bs))));
+        info->setBrowser(bs->readBoolean());
+        info->setDestination(Pointer<ActiveMQDestination>(dynamic_cast<ActiveMQDestination* >(
+            tightUnmarshalCachedObject(wireFormat, dataIn, bs))));
+        info->setPrefetchSize(dataIn->readInt());
+        info->setMaximumPendingMessageLimit(dataIn->readInt());
+        info->setDispatchAsync(bs->readBoolean());
+        info->setSelector(tightUnmarshalString(dataIn, bs));
+        info->setSubscriptionName(tightUnmarshalString(dataIn, bs));
+        info->setNoLocal(bs->readBoolean());
+        info->setExclusive(bs->readBoolean());
+        info->setRetroactive(bs->readBoolean());
+        info->setPriority(dataIn->readByte());
 
-        if( bs->readBoolean() ) {
+        if (bs->readBoolean()) {
             short size = dataIn->readShort();
-            info->getBrokerPath().reserve( size );
-            for( int i = 0; i < size; i++ ) {
-                info->getBrokerPath().push_back( Pointer<BrokerId>( dynamic_cast< BrokerId* >(
-                    tightUnmarshalNestedObject( wireFormat, dataIn, bs ) ) ) );
+            info->getBrokerPath().reserve(size);
+            for (int i = 0; i < size; i++) {
+                info->getBrokerPath().push_back(Pointer<BrokerId>(dynamic_cast<BrokerId*>(
+                    tightUnmarshalNestedObject(wireFormat, dataIn, bs))));
             }
         } else {
             info->getBrokerPath().clear();
         }
-        info->setAdditionalPredicate( Pointer<BooleanExpression>( dynamic_cast< BooleanExpression* >(
-            tightUnmarshalNestedObject( wireFormat, dataIn, bs ) ) ) );
-        info->setNetworkSubscription( bs->readBoolean() );
-        info->setOptimizedAcknowledge( bs->readBoolean() );
-        info->setNoRangeAcks( bs->readBoolean() );
-        if( wireVersion >= 4 ) {
+        info->setAdditionalPredicate(Pointer<BooleanExpression>(dynamic_cast<BooleanExpression* >(
+            tightUnmarshalNestedObject(wireFormat, dataIn, bs))));
+        info->setNetworkSubscription(bs->readBoolean());
+        info->setOptimizedAcknowledge(bs->readBoolean());
+        info->setNoRangeAcks(bs->readBoolean());
+        if (wireVersion >= 4) {
 
-            if( bs->readBoolean() ) {
+            if (bs->readBoolean()) {
                 short size = dataIn->readShort();
-                info->getNetworkConsumerPath().reserve( size );
-                for( int i = 0; i < size; i++ ) {
-                    info->getNetworkConsumerPath().push_back( Pointer<ConsumerId>( dynamic_cast< ConsumerId* >(
-                        tightUnmarshalNestedObject( wireFormat, dataIn, bs ) ) ) );
+                info->getNetworkConsumerPath().reserve(size);
+                for (int i = 0; i < size; i++) {
+                    info->getNetworkConsumerPath().push_back(Pointer<ConsumerId>(dynamic_cast<ConsumerId*>(
+                        tightUnmarshalNestedObject(wireFormat, dataIn, bs))));
                 }
             } else {
                 info->getNetworkConsumerPath().clear();
             }
         }
     }
-    AMQ_CATCH_RETHROW( decaf::io::IOException )
-    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
-    AMQ_CATCHALL_THROW( decaf::io::IOException )
+    AMQ_CATCH_RETHROW(decaf::io::IOException)
+    AMQ_CATCH_EXCEPTION_CONVERT(exceptions::ActiveMQException, decaf::io::IOException)
+    AMQ_CATCHALL_THROW(decaf::io::IOException)
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-int ConsumerInfoMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) {
+int ConsumerInfoMarshaller::tightMarshal1(OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs) {
 
     try {
 
         ConsumerInfo* info =
-            dynamic_cast<ConsumerInfo*>( dataStructure );
+            dynamic_cast<ConsumerInfo*>(dataStructure);
 
-        int rc = BaseCommandMarshaller::tightMarshal1( wireFormat, dataStructure, bs );
+        int rc = BaseCommandMarshaller::tightMarshal1(wireFormat, dataStructure, bs);
 
         int wireVersion = wireFormat->getVersion();
 
-        rc += tightMarshalCachedObject1( wireFormat, info->getConsumerId().get(), bs );
-        bs->writeBoolean( info->isBrowser() );
-        rc += tightMarshalCachedObject1( wireFormat, info->getDestination().get(), bs );
-        bs->writeBoolean( info->isDispatchAsync() );
-        rc += tightMarshalString1( info->getSelector(), bs );
-        rc += tightMarshalString1( info->getSubscriptionName(), bs );
-        bs->writeBoolean( info->isNoLocal() );
-        bs->writeBoolean( info->isExclusive() );
-        bs->writeBoolean( info->isRetroactive() );
-        rc += tightMarshalObjectArray1( wireFormat, info->getBrokerPath(), bs );
-        rc += tightMarshalNestedObject1( wireFormat, info->getAdditionalPredicate().get(), bs );
-        bs->writeBoolean( info->isNetworkSubscription() );
-        bs->writeBoolean( info->isOptimizedAcknowledge() );
-        bs->writeBoolean( info->isNoRangeAcks() );
-        if( wireVersion >= 4 ) {
-            rc += tightMarshalObjectArray1( wireFormat, info->getNetworkConsumerPath(), bs );
+        rc += tightMarshalCachedObject1(wireFormat, info->getConsumerId().get(), bs);
+        bs->writeBoolean(info->isBrowser());
+        rc += tightMarshalCachedObject1(wireFormat, info->getDestination().get(), bs);
+        bs->writeBoolean(info->isDispatchAsync());
+        rc += tightMarshalString1(info->getSelector(), bs);
+        rc += tightMarshalString1(info->getSubscriptionName(), bs);
+        bs->writeBoolean(info->isNoLocal());
+        bs->writeBoolean(info->isExclusive());
+        bs->writeBoolean(info->isRetroactive());
+        rc += tightMarshalObjectArray1(wireFormat, info->getBrokerPath(), bs);
+        rc += tightMarshalNestedObject1(wireFormat, info->getAdditionalPredicate().get(), bs);
+        bs->writeBoolean(info->isNetworkSubscription());
+        bs->writeBoolean(info->isOptimizedAcknowledge());
+        bs->writeBoolean(info->isNoRangeAcks());
+        if (wireVersion >= 4) {
+            rc += tightMarshalObjectArray1(wireFormat, info->getNetworkConsumerPath(), bs);
         }
 
         return rc + 9;
     }
-    AMQ_CATCH_RETHROW( decaf::io::IOException )
-    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
-    AMQ_CATCHALL_THROW( decaf::io::IOException )
+    AMQ_CATCH_RETHROW(decaf::io::IOException)
+    AMQ_CATCH_EXCEPTION_CONVERT(exceptions::ActiveMQException, decaf::io::IOException)
+    AMQ_CATCHALL_THROW(decaf::io::IOException)
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void ConsumerInfoMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) {
+void ConsumerInfoMarshaller::tightMarshal2(OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs) {
 
     try {
 
-        BaseCommandMarshaller::tightMarshal2( wireFormat, dataStructure, dataOut, bs );
+        BaseCommandMarshaller::tightMarshal2(wireFormat, dataStructure, dataOut, bs );
 
         ConsumerInfo* info =
-            dynamic_cast<ConsumerInfo*>( dataStructure );
+            dynamic_cast<ConsumerInfo*>(dataStructure);
 
         int wireVersion = wireFormat->getVersion();
 
-        tightMarshalCachedObject2( wireFormat, info->getConsumerId().get(), dataOut, bs );
+        tightMarshalCachedObject2(wireFormat, info->getConsumerId().get(), dataOut, bs);
         bs->readBoolean();
-        tightMarshalCachedObject2( wireFormat, info->getDestination().get(), dataOut, bs );
-        dataOut->writeInt( info->getPrefetchSize() );
-        dataOut->writeInt( info->getMaximumPendingMessageLimit() );
+        tightMarshalCachedObject2(wireFormat, info->getDestination().get(), dataOut, bs);
+        dataOut->writeInt(info->getPrefetchSize());
+        dataOut->writeInt(info->getMaximumPendingMessageLimit());
         bs->readBoolean();
-        tightMarshalString2( info->getSelector(), dataOut, bs );
-        tightMarshalString2( info->getSubscriptionName(), dataOut, bs );
+        tightMarshalString2(info->getSelector(), dataOut, bs);
+        tightMarshalString2(info->getSubscriptionName(), dataOut, bs);
         bs->readBoolean();
         bs->readBoolean();
         bs->readBoolean();
-        dataOut->write( info->getPriority() );
-        tightMarshalObjectArray2( wireFormat, info->getBrokerPath(), dataOut, bs );
-        tightMarshalNestedObject2( wireFormat, info->getAdditionalPredicate().get(), dataOut, bs );
+        dataOut->write(info->getPriority());
+        tightMarshalObjectArray2(wireFormat, info->getBrokerPath(), dataOut, bs);
+        tightMarshalNestedObject2(wireFormat, info->getAdditionalPredicate().get(), dataOut, bs);
         bs->readBoolean();
         bs->readBoolean();
         bs->readBoolean();
-        if( wireVersion >= 4 ) {
-            tightMarshalObjectArray2( wireFormat, info->getNetworkConsumerPath(), dataOut, bs );
+        if (wireVersion >= 4) {
+            tightMarshalObjectArray2(wireFormat, info->getNetworkConsumerPath(), dataOut, bs);
         }
     }
-    AMQ_CATCH_RETHROW( decaf::io::IOException )
-    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
-    AMQ_CATCHALL_THROW( decaf::io::IOException )
+    AMQ_CATCH_RETHROW(decaf::io::IOException)
+    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException)
+    AMQ_CATCHALL_THROW(decaf::io::IOException)
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void ConsumerInfoMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) {
+void ConsumerInfoMarshaller::looseUnmarshal(OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn) {
 
     try {
 
-        BaseCommandMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
+        BaseCommandMarshaller::looseUnmarshal(wireFormat, dataStructure, dataIn);
         ConsumerInfo* info =
-            dynamic_cast<ConsumerInfo*>( dataStructure );
+            dynamic_cast<ConsumerInfo*>(dataStructure);
 
         int wireVersion = wireFormat->getVersion();
 
-        info->setConsumerId( Pointer<ConsumerId>( dynamic_cast< ConsumerId* >( 
-            looseUnmarshalCachedObject( wireFormat, dataIn ) ) ) );
-        info->setBrowser( dataIn->readBoolean() );
-        info->setDestination( Pointer<ActiveMQDestination>( dynamic_cast< ActiveMQDestination* >( 
-            looseUnmarshalCachedObject( wireFormat, dataIn ) ) ) );
-        info->setPrefetchSize( dataIn->readInt() );
-        info->setMaximumPendingMessageLimit( dataIn->readInt() );
-        info->setDispatchAsync( dataIn->readBoolean() );
-        info->setSelector( looseUnmarshalString( dataIn ) );
-        info->setSubscriptionName( looseUnmarshalString( dataIn ) );
-        info->setNoLocal( dataIn->readBoolean() );
-        info->setExclusive( dataIn->readBoolean() );
-        info->setRetroactive( dataIn->readBoolean() );
-        info->setPriority( dataIn->readByte() );
+        info->setConsumerId(Pointer<ConsumerId>(dynamic_cast<ConsumerId*>(
+            looseUnmarshalCachedObject(wireFormat, dataIn))));
+        info->setBrowser(dataIn->readBoolean());
+        info->setDestination(Pointer<ActiveMQDestination>(dynamic_cast<ActiveMQDestination*>(
+            looseUnmarshalCachedObject(wireFormat, dataIn))));
+        info->setPrefetchSize(dataIn->readInt());
+        info->setMaximumPendingMessageLimit(dataIn->readInt());
+        info->setDispatchAsync(dataIn->readBoolean());
+        info->setSelector(looseUnmarshalString(dataIn));
+        info->setSubscriptionName(looseUnmarshalString(dataIn));
+        info->setNoLocal(dataIn->readBoolean());
+        info->setExclusive(dataIn->readBoolean());
+        info->setRetroactive(dataIn->readBoolean());
+        info->setPriority(dataIn->readByte());
 
-        if( dataIn->readBoolean() ) {
+        if (dataIn->readBoolean()) {
             short size = dataIn->readShort();
-            info->getBrokerPath().reserve( size );
-            for( int i = 0; i < size; i++ ) {
-                info->getBrokerPath().push_back( Pointer<BrokerId>( dynamic_cast<BrokerId* >(
-                    looseUnmarshalNestedObject( wireFormat, dataIn ) ) ) );
+            info->getBrokerPath().reserve(size);
+            for (int i = 0; i < size; i++) {
+                info->getBrokerPath().push_back( Pointer<BrokerId>(dynamic_cast<BrokerId*>(
+                    looseUnmarshalNestedObject(wireFormat, dataIn))));
             }
         } else {
             info->getBrokerPath().clear();
         }
-        info->setAdditionalPredicate( Pointer<BooleanExpression>( dynamic_cast< BooleanExpression* >( 
-            looseUnmarshalNestedObject( wireFormat, dataIn ) ) ) );
-        info->setNetworkSubscription( dataIn->readBoolean() );
-        info->setOptimizedAcknowledge( dataIn->readBoolean() );
-        info->setNoRangeAcks( dataIn->readBoolean() );
-        if( wireVersion >= 4 ) {
+        info->setAdditionalPredicate(Pointer<BooleanExpression>(dynamic_cast<BooleanExpression*>(
+            looseUnmarshalNestedObject(wireFormat, dataIn))));
+        info->setNetworkSubscription(dataIn->readBoolean());
+        info->setOptimizedAcknowledge(dataIn->readBoolean());
+        info->setNoRangeAcks(dataIn->readBoolean());
+        if (wireVersion >= 4) {
 
-            if( dataIn->readBoolean() ) {
+            if (dataIn->readBoolean()) {
                 short size = dataIn->readShort();
-                info->getNetworkConsumerPath().reserve( size );
-                for( int i = 0; i < size; i++ ) {
-                    info->getNetworkConsumerPath().push_back( Pointer<ConsumerId>( dynamic_cast<ConsumerId* >(
-                        looseUnmarshalNestedObject( wireFormat, dataIn ) ) ) );
+                info->getNetworkConsumerPath().reserve(size);
+                for (int i = 0; i < size; i++) {
+                    info->getNetworkConsumerPath().push_back( Pointer<ConsumerId>(dynamic_cast<ConsumerId*>(
+                        looseUnmarshalNestedObject(wireFormat, dataIn))));
                 }
             } else {
                 info->getNetworkConsumerPath().clear();
             }
         }
     }
-    AMQ_CATCH_RETHROW( decaf::io::IOException )
-    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
-    AMQ_CATCHALL_THROW( decaf::io::IOException )
+    AMQ_CATCH_RETHROW(decaf::io::IOException)
+    AMQ_CATCH_EXCEPTION_CONVERT(exceptions::ActiveMQException, decaf::io::IOException)
+    AMQ_CATCHALL_THROW(decaf::io::IOException)
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void ConsumerInfoMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) {
+void ConsumerInfoMarshaller::looseMarshal(OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut) {
 
     try {
 
         ConsumerInfo* info =
-            dynamic_cast<ConsumerInfo*>( dataStructure );
-        BaseCommandMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
+            dynamic_cast<ConsumerInfo*>(dataStructure);
+        BaseCommandMarshaller::looseMarshal(wireFormat, dataStructure, dataOut);
 
         int wireVersion = wireFormat->getVersion();
 
-        looseMarshalCachedObject( wireFormat, info->getConsumerId().get(), dataOut );
-        dataOut->writeBoolean( info->isBrowser() );
-        looseMarshalCachedObject( wireFormat, info->getDestination().get(), dataOut );
-        dataOut->writeInt( info->getPrefetchSize() );
-        dataOut->writeInt( info->getMaximumPendingMessageLimit() );
-        dataOut->writeBoolean( info->isDispatchAsync() );
-        looseMarshalString( info->getSelector(), dataOut );
-        looseMarshalString( info->getSubscriptionName(), dataOut );
-        dataOut->writeBoolean( info->isNoLocal() );
-        dataOut->writeBoolean( info->isExclusive() );
-        dataOut->writeBoolean( info->isRetroactive() );
-        dataOut->write( info->getPriority() );
-        looseMarshalObjectArray( wireFormat, info->getBrokerPath(), dataOut );
-        looseMarshalNestedObject( wireFormat, info->getAdditionalPredicate().get(), dataOut );
-        dataOut->writeBoolean( info->isNetworkSubscription() );
-        dataOut->writeBoolean( info->isOptimizedAcknowledge() );
-        dataOut->writeBoolean( info->isNoRangeAcks() );
-        if( wireVersion >= 4 ) {
-            looseMarshalObjectArray( wireFormat, info->getNetworkConsumerPath(), dataOut );
+        looseMarshalCachedObject(wireFormat, info->getConsumerId().get(), dataOut);
+        dataOut->writeBoolean(info->isBrowser());
+        looseMarshalCachedObject(wireFormat, info->getDestination().get(), dataOut);
+        dataOut->writeInt(info->getPrefetchSize());
+        dataOut->writeInt(info->getMaximumPendingMessageLimit());
+        dataOut->writeBoolean(info->isDispatchAsync());
+        looseMarshalString(info->getSelector(), dataOut);
+        looseMarshalString(info->getSubscriptionName(), dataOut);
+        dataOut->writeBoolean(info->isNoLocal());
+        dataOut->writeBoolean(info->isExclusive());
+        dataOut->writeBoolean(info->isRetroactive());
+        dataOut->write(info->getPriority());
+        looseMarshalObjectArray(wireFormat, info->getBrokerPath(), dataOut);
+        looseMarshalNestedObject(wireFormat, info->getAdditionalPredicate().get(), dataOut);
+        dataOut->writeBoolean(info->isNetworkSubscription());
+        dataOut->writeBoolean(info->isOptimizedAcknowledge());
+        dataOut->writeBoolean(info->isNoRangeAcks());
+        if (wireVersion >= 4) {
+            looseMarshalObjectArray(wireFormat, info->getNetworkConsumerPath(), dataOut);
         }
     }
-    AMQ_CATCH_RETHROW( decaf::io::IOException )
-    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
-    AMQ_CATCHALL_THROW( decaf::io::IOException )
+    AMQ_CATCH_RETHROW(decaf::io::IOException)
+    AMQ_CATCH_EXCEPTION_CONVERT(exceptions::ActiveMQException, decaf::io::IOException)
+    AMQ_CATCHALL_THROW(decaf::io::IOException)
 }
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ConsumerInfoMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ConsumerInfoMarshaller.h?rev=1460467&r1=1460466&r2=1460467&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ConsumerInfoMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ConsumerInfoMarshaller.h Sun Mar 24 21:30:52 2013
@@ -33,11 +33,11 @@
 #include <activemq/wireformat/openwire/OpenWireFormat.h>
 #include <activemq/wireformat/openwire/utils/BooleanStream.h>
 
-namespace activemq{
-namespace wireformat{
-namespace openwire{
-namespace marshal{
-namespace generated{
+namespace activemq {
+namespace wireformat {
+namespace openwire {
+namespace marshal {
+namespace generated {
 
     /**
      * Marshaling code for Open Wire Format for ConsumerInfoMarshaller
@@ -56,27 +56,27 @@ namespace generated{
 
         virtual unsigned char getDataStructureType() const;
 
-        virtual void tightUnmarshal( OpenWireFormat* wireFormat,
-                                     commands::DataStructure* dataStructure,
-                                     decaf::io::DataInputStream* dataIn,
-                                     utils::BooleanStream* bs );
+        virtual void tightUnmarshal(OpenWireFormat* wireFormat,
+                                    commands::DataStructure* dataStructure,
+                                    decaf::io::DataInputStream* dataIn,
+                                    utils::BooleanStream* bs);
+
+        virtual int tightMarshal1(OpenWireFormat* wireFormat,
+                                  commands::DataStructure* dataStructure,
+                                  utils::BooleanStream* bs);
 
-        virtual int tightMarshal1( OpenWireFormat* wireFormat,
+        virtual void tightMarshal2(OpenWireFormat* wireFormat,
                                    commands::DataStructure* dataStructure,
-                                   utils::BooleanStream* bs );
+                                   decaf::io::DataOutputStream* dataOut,
+                                   utils::BooleanStream* bs);
 
-        virtual void tightMarshal2( OpenWireFormat* wireFormat,
+        virtual void looseUnmarshal(OpenWireFormat* wireFormat,
                                     commands::DataStructure* dataStructure,
-                                    decaf::io::DataOutputStream* dataOut,
-                                    utils::BooleanStream* bs );
+                                    decaf::io::DataInputStream* dataIn);
 
-        virtual void looseUnmarshal( OpenWireFormat* wireFormat,
-                                     commands::DataStructure* dataStructure,
-                                     decaf::io::DataInputStream* dataIn );
-
-        virtual void looseMarshal( OpenWireFormat* wireFormat,
-                                   commands::DataStructure* dataStructure,
-                                   decaf::io::DataOutputStream* dataOut );
+        virtual void looseMarshal(OpenWireFormat* wireFormat,
+                                  commands::DataStructure* dataStructure,
+                                  decaf::io::DataOutputStream* dataOut);
 
     };
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ControlCommandMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ControlCommandMarshaller.cpp?rev=1460467&r1=1460466&r2=1460467&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ControlCommandMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ControlCommandMarshaller.cpp Sun Mar 24 21:30:52 2013
@@ -51,82 +51,82 @@ unsigned char ControlCommandMarshaller::
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void ControlCommandMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) {
+void ControlCommandMarshaller::tightUnmarshal(OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs) {
 
     try {
 
-        BaseCommandMarshaller::tightUnmarshal( wireFormat, dataStructure, dataIn, bs );
+        BaseCommandMarshaller::tightUnmarshal(wireFormat, dataStructure, dataIn, bs);
 
         ControlCommand* info =
-            dynamic_cast<ControlCommand*>( dataStructure );
-        info->setCommand( tightUnmarshalString( dataIn, bs ) );
+            dynamic_cast<ControlCommand*>(dataStructure);
+        info->setCommand(tightUnmarshalString(dataIn, bs));
     }
-    AMQ_CATCH_RETHROW( decaf::io::IOException )
-    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
-    AMQ_CATCHALL_THROW( decaf::io::IOException )
+    AMQ_CATCH_RETHROW(decaf::io::IOException)
+    AMQ_CATCH_EXCEPTION_CONVERT(exceptions::ActiveMQException, decaf::io::IOException)
+    AMQ_CATCHALL_THROW(decaf::io::IOException)
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-int ControlCommandMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) {
+int ControlCommandMarshaller::tightMarshal1(OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs) {
 
     try {
 
         ControlCommand* info =
-            dynamic_cast<ControlCommand*>( dataStructure );
+            dynamic_cast<ControlCommand*>(dataStructure);
 
-        int rc = BaseCommandMarshaller::tightMarshal1( wireFormat, dataStructure, bs );
-        rc += tightMarshalString1( info->getCommand(), bs );
+        int rc = BaseCommandMarshaller::tightMarshal1(wireFormat, dataStructure, bs);
+        rc += tightMarshalString1(info->getCommand(), bs);
 
         return rc + 0;
     }
-    AMQ_CATCH_RETHROW( decaf::io::IOException )
-    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
-    AMQ_CATCHALL_THROW( decaf::io::IOException )
+    AMQ_CATCH_RETHROW(decaf::io::IOException)
+    AMQ_CATCH_EXCEPTION_CONVERT(exceptions::ActiveMQException, decaf::io::IOException)
+    AMQ_CATCHALL_THROW(decaf::io::IOException)
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void ControlCommandMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) {
+void ControlCommandMarshaller::tightMarshal2(OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs) {
 
     try {
 
-        BaseCommandMarshaller::tightMarshal2( wireFormat, dataStructure, dataOut, bs );
+        BaseCommandMarshaller::tightMarshal2(wireFormat, dataStructure, dataOut, bs );
 
         ControlCommand* info =
-            dynamic_cast<ControlCommand*>( dataStructure );
-        tightMarshalString2( info->getCommand(), dataOut, bs );
+            dynamic_cast<ControlCommand*>(dataStructure);
+        tightMarshalString2(info->getCommand(), dataOut, bs);
     }
-    AMQ_CATCH_RETHROW( decaf::io::IOException )
-    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
-    AMQ_CATCHALL_THROW( decaf::io::IOException )
+    AMQ_CATCH_RETHROW(decaf::io::IOException)
+    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException)
+    AMQ_CATCHALL_THROW(decaf::io::IOException)
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void ControlCommandMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) {
+void ControlCommandMarshaller::looseUnmarshal(OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn) {
 
     try {
 
-        BaseCommandMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
+        BaseCommandMarshaller::looseUnmarshal(wireFormat, dataStructure, dataIn);
         ControlCommand* info =
-            dynamic_cast<ControlCommand*>( dataStructure );
-        info->setCommand( looseUnmarshalString( dataIn ) );
+            dynamic_cast<ControlCommand*>(dataStructure);
+        info->setCommand(looseUnmarshalString(dataIn));
     }
-    AMQ_CATCH_RETHROW( decaf::io::IOException )
-    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
-    AMQ_CATCHALL_THROW( decaf::io::IOException )
+    AMQ_CATCH_RETHROW(decaf::io::IOException)
+    AMQ_CATCH_EXCEPTION_CONVERT(exceptions::ActiveMQException, decaf::io::IOException)
+    AMQ_CATCHALL_THROW(decaf::io::IOException)
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void ControlCommandMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) {
+void ControlCommandMarshaller::looseMarshal(OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut) {
 
     try {
 
         ControlCommand* info =
-            dynamic_cast<ControlCommand*>( dataStructure );
-        BaseCommandMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
-        looseMarshalString( info->getCommand(), dataOut );
+            dynamic_cast<ControlCommand*>(dataStructure);
+        BaseCommandMarshaller::looseMarshal(wireFormat, dataStructure, dataOut);
+        looseMarshalString(info->getCommand(), dataOut);
     }
-    AMQ_CATCH_RETHROW( decaf::io::IOException )
-    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
-    AMQ_CATCHALL_THROW( decaf::io::IOException )
+    AMQ_CATCH_RETHROW(decaf::io::IOException)
+    AMQ_CATCH_EXCEPTION_CONVERT(exceptions::ActiveMQException, decaf::io::IOException)
+    AMQ_CATCHALL_THROW(decaf::io::IOException)
 }
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ControlCommandMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ControlCommandMarshaller.h?rev=1460467&r1=1460466&r2=1460467&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ControlCommandMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ControlCommandMarshaller.h Sun Mar 24 21:30:52 2013
@@ -33,11 +33,11 @@
 #include <activemq/wireformat/openwire/OpenWireFormat.h>
 #include <activemq/wireformat/openwire/utils/BooleanStream.h>
 
-namespace activemq{
-namespace wireformat{
-namespace openwire{
-namespace marshal{
-namespace generated{
+namespace activemq {
+namespace wireformat {
+namespace openwire {
+namespace marshal {
+namespace generated {
 
     /**
      * Marshaling code for Open Wire Format for ControlCommandMarshaller
@@ -56,27 +56,27 @@ namespace generated{
 
         virtual unsigned char getDataStructureType() const;
 
-        virtual void tightUnmarshal( OpenWireFormat* wireFormat,
-                                     commands::DataStructure* dataStructure,
-                                     decaf::io::DataInputStream* dataIn,
-                                     utils::BooleanStream* bs );
+        virtual void tightUnmarshal(OpenWireFormat* wireFormat,
+                                    commands::DataStructure* dataStructure,
+                                    decaf::io::DataInputStream* dataIn,
+                                    utils::BooleanStream* bs);
+
+        virtual int tightMarshal1(OpenWireFormat* wireFormat,
+                                  commands::DataStructure* dataStructure,
+                                  utils::BooleanStream* bs);
 
-        virtual int tightMarshal1( OpenWireFormat* wireFormat,
+        virtual void tightMarshal2(OpenWireFormat* wireFormat,
                                    commands::DataStructure* dataStructure,
-                                   utils::BooleanStream* bs );
+                                   decaf::io::DataOutputStream* dataOut,
+                                   utils::BooleanStream* bs);
 
-        virtual void tightMarshal2( OpenWireFormat* wireFormat,
+        virtual void looseUnmarshal(OpenWireFormat* wireFormat,
                                     commands::DataStructure* dataStructure,
-                                    decaf::io::DataOutputStream* dataOut,
-                                    utils::BooleanStream* bs );
+                                    decaf::io::DataInputStream* dataIn);
 
-        virtual void looseUnmarshal( OpenWireFormat* wireFormat,
-                                     commands::DataStructure* dataStructure,
-                                     decaf::io::DataInputStream* dataIn );
-
-        virtual void looseMarshal( OpenWireFormat* wireFormat,
-                                   commands::DataStructure* dataStructure,
-                                   decaf::io::DataOutputStream* dataOut );
+        virtual void looseMarshal(OpenWireFormat* wireFormat,
+                                  commands::DataStructure* dataStructure,
+                                  decaf::io::DataOutputStream* dataOut);
 
     };
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/DataArrayResponseMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/DataArrayResponseMarshaller.cpp?rev=1460467&r1=1460466&r2=1460467&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/DataArrayResponseMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/DataArrayResponseMarshaller.cpp Sun Mar 24 21:30:52 2013
@@ -51,102 +51,102 @@ unsigned char DataArrayResponseMarshalle
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void DataArrayResponseMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) {
+void DataArrayResponseMarshaller::tightUnmarshal(OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs) {
 
     try {
 
-        ResponseMarshaller::tightUnmarshal( wireFormat, dataStructure, dataIn, bs );
+        ResponseMarshaller::tightUnmarshal(wireFormat, dataStructure, dataIn, bs);
 
         DataArrayResponse* info =
-            dynamic_cast<DataArrayResponse*>( dataStructure );
+            dynamic_cast<DataArrayResponse*>(dataStructure);
 
-        if( bs->readBoolean() ) {
+        if (bs->readBoolean()) {
             short size = dataIn->readShort();
-            info->getData().reserve( size );
-            for( int i = 0; i < size; i++ ) {
-                info->getData().push_back( Pointer<DataStructure>( dynamic_cast< DataStructure* >(
-                    tightUnmarshalNestedObject( wireFormat, dataIn, bs ) ) ) );
+            info->getData().reserve(size);
+            for (int i = 0; i < size; i++) {
+                info->getData().push_back(Pointer<DataStructure>(dynamic_cast<DataStructure*>(
+                    tightUnmarshalNestedObject(wireFormat, dataIn, bs))));
             }
         } else {
             info->getData().clear();
         }
     }
-    AMQ_CATCH_RETHROW( decaf::io::IOException )
-    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
-    AMQ_CATCHALL_THROW( decaf::io::IOException )
+    AMQ_CATCH_RETHROW(decaf::io::IOException)
+    AMQ_CATCH_EXCEPTION_CONVERT(exceptions::ActiveMQException, decaf::io::IOException)
+    AMQ_CATCHALL_THROW(decaf::io::IOException)
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-int DataArrayResponseMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) {
+int DataArrayResponseMarshaller::tightMarshal1(OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs) {
 
     try {
 
         DataArrayResponse* info =
-            dynamic_cast<DataArrayResponse*>( dataStructure );
+            dynamic_cast<DataArrayResponse*>(dataStructure);
 
-        int rc = ResponseMarshaller::tightMarshal1( wireFormat, dataStructure, bs );
-        rc += tightMarshalObjectArray1( wireFormat, info->getData(), bs );
+        int rc = ResponseMarshaller::tightMarshal1(wireFormat, dataStructure, bs);
+        rc += tightMarshalObjectArray1(wireFormat, info->getData(), bs);
 
         return rc + 0;
     }
-    AMQ_CATCH_RETHROW( decaf::io::IOException )
-    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
-    AMQ_CATCHALL_THROW( decaf::io::IOException )
+    AMQ_CATCH_RETHROW(decaf::io::IOException)
+    AMQ_CATCH_EXCEPTION_CONVERT(exceptions::ActiveMQException, decaf::io::IOException)
+    AMQ_CATCHALL_THROW(decaf::io::IOException)
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void DataArrayResponseMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) {
+void DataArrayResponseMarshaller::tightMarshal2(OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs) {
 
     try {
 
-        ResponseMarshaller::tightMarshal2( wireFormat, dataStructure, dataOut, bs );
+        ResponseMarshaller::tightMarshal2(wireFormat, dataStructure, dataOut, bs );
 
         DataArrayResponse* info =
-            dynamic_cast<DataArrayResponse*>( dataStructure );
-        tightMarshalObjectArray2( wireFormat, info->getData(), dataOut, bs );
+            dynamic_cast<DataArrayResponse*>(dataStructure);
+        tightMarshalObjectArray2(wireFormat, info->getData(), dataOut, bs);
     }
-    AMQ_CATCH_RETHROW( decaf::io::IOException )
-    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
-    AMQ_CATCHALL_THROW( decaf::io::IOException )
+    AMQ_CATCH_RETHROW(decaf::io::IOException)
+    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException)
+    AMQ_CATCHALL_THROW(decaf::io::IOException)
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void DataArrayResponseMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) {
+void DataArrayResponseMarshaller::looseUnmarshal(OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn) {
 
     try {
 
-        ResponseMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
+        ResponseMarshaller::looseUnmarshal(wireFormat, dataStructure, dataIn);
         DataArrayResponse* info =
-            dynamic_cast<DataArrayResponse*>( dataStructure );
+            dynamic_cast<DataArrayResponse*>(dataStructure);
 
-        if( dataIn->readBoolean() ) {
+        if (dataIn->readBoolean()) {
             short size = dataIn->readShort();
-            info->getData().reserve( size );
-            for( int i = 0; i < size; i++ ) {
-                info->getData().push_back( Pointer<DataStructure>( dynamic_cast<DataStructure* >(
-                    looseUnmarshalNestedObject( wireFormat, dataIn ) ) ) );
+            info->getData().reserve(size);
+            for (int i = 0; i < size; i++) {
+                info->getData().push_back( Pointer<DataStructure>(dynamic_cast<DataStructure*>(
+                    looseUnmarshalNestedObject(wireFormat, dataIn))));
             }
         } else {
             info->getData().clear();
         }
     }
-    AMQ_CATCH_RETHROW( decaf::io::IOException )
-    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
-    AMQ_CATCHALL_THROW( decaf::io::IOException )
+    AMQ_CATCH_RETHROW(decaf::io::IOException)
+    AMQ_CATCH_EXCEPTION_CONVERT(exceptions::ActiveMQException, decaf::io::IOException)
+    AMQ_CATCHALL_THROW(decaf::io::IOException)
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void DataArrayResponseMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) {
+void DataArrayResponseMarshaller::looseMarshal(OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut) {
 
     try {
 
         DataArrayResponse* info =
-            dynamic_cast<DataArrayResponse*>( dataStructure );
-        ResponseMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
-        looseMarshalObjectArray( wireFormat, info->getData(), dataOut );
+            dynamic_cast<DataArrayResponse*>(dataStructure);
+        ResponseMarshaller::looseMarshal(wireFormat, dataStructure, dataOut);
+        looseMarshalObjectArray(wireFormat, info->getData(), dataOut);
     }
-    AMQ_CATCH_RETHROW( decaf::io::IOException )
-    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
-    AMQ_CATCHALL_THROW( decaf::io::IOException )
+    AMQ_CATCH_RETHROW(decaf::io::IOException)
+    AMQ_CATCH_EXCEPTION_CONVERT(exceptions::ActiveMQException, decaf::io::IOException)
+    AMQ_CATCHALL_THROW(decaf::io::IOException)
 }
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/DataArrayResponseMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/DataArrayResponseMarshaller.h?rev=1460467&r1=1460466&r2=1460467&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/DataArrayResponseMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/DataArrayResponseMarshaller.h Sun Mar 24 21:30:52 2013
@@ -33,11 +33,11 @@
 #include <activemq/wireformat/openwire/OpenWireFormat.h>
 #include <activemq/wireformat/openwire/utils/BooleanStream.h>
 
-namespace activemq{
-namespace wireformat{
-namespace openwire{
-namespace marshal{
-namespace generated{
+namespace activemq {
+namespace wireformat {
+namespace openwire {
+namespace marshal {
+namespace generated {
 
     /**
      * Marshaling code for Open Wire Format for DataArrayResponseMarshaller
@@ -56,27 +56,27 @@ namespace generated{
 
         virtual unsigned char getDataStructureType() const;
 
-        virtual void tightUnmarshal( OpenWireFormat* wireFormat,
-                                     commands::DataStructure* dataStructure,
-                                     decaf::io::DataInputStream* dataIn,
-                                     utils::BooleanStream* bs );
+        virtual void tightUnmarshal(OpenWireFormat* wireFormat,
+                                    commands::DataStructure* dataStructure,
+                                    decaf::io::DataInputStream* dataIn,
+                                    utils::BooleanStream* bs);
+
+        virtual int tightMarshal1(OpenWireFormat* wireFormat,
+                                  commands::DataStructure* dataStructure,
+                                  utils::BooleanStream* bs);
 
-        virtual int tightMarshal1( OpenWireFormat* wireFormat,
+        virtual void tightMarshal2(OpenWireFormat* wireFormat,
                                    commands::DataStructure* dataStructure,
-                                   utils::BooleanStream* bs );
+                                   decaf::io::DataOutputStream* dataOut,
+                                   utils::BooleanStream* bs);
 
-        virtual void tightMarshal2( OpenWireFormat* wireFormat,
+        virtual void looseUnmarshal(OpenWireFormat* wireFormat,
                                     commands::DataStructure* dataStructure,
-                                    decaf::io::DataOutputStream* dataOut,
-                                    utils::BooleanStream* bs );
+                                    decaf::io::DataInputStream* dataIn);
 
-        virtual void looseUnmarshal( OpenWireFormat* wireFormat,
-                                     commands::DataStructure* dataStructure,
-                                     decaf::io::DataInputStream* dataIn );
-
-        virtual void looseMarshal( OpenWireFormat* wireFormat,
-                                   commands::DataStructure* dataStructure,
-                                   decaf::io::DataOutputStream* dataOut );
+        virtual void looseMarshal(OpenWireFormat* wireFormat,
+                                  commands::DataStructure* dataStructure,
+                                  decaf::io::DataOutputStream* dataOut);
 
     };
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/DataResponseMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/DataResponseMarshaller.cpp?rev=1460467&r1=1460466&r2=1460467&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/DataResponseMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/DataResponseMarshaller.cpp Sun Mar 24 21:30:52 2013
@@ -51,84 +51,84 @@ unsigned char DataResponseMarshaller::ge
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void DataResponseMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) {
+void DataResponseMarshaller::tightUnmarshal(OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs) {
 
     try {
 
-        ResponseMarshaller::tightUnmarshal( wireFormat, dataStructure, dataIn, bs );
+        ResponseMarshaller::tightUnmarshal(wireFormat, dataStructure, dataIn, bs);
 
         DataResponse* info =
-            dynamic_cast<DataResponse*>( dataStructure );
-        info->setData( Pointer<DataStructure>( dynamic_cast< DataStructure* >(
-            tightUnmarshalNestedObject( wireFormat, dataIn, bs ) ) ) );
+            dynamic_cast<DataResponse*>(dataStructure);
+        info->setData(Pointer<DataStructure>(dynamic_cast<DataStructure* >(
+            tightUnmarshalNestedObject(wireFormat, dataIn, bs))));
     }
-    AMQ_CATCH_RETHROW( decaf::io::IOException )
-    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
-    AMQ_CATCHALL_THROW( decaf::io::IOException )
+    AMQ_CATCH_RETHROW(decaf::io::IOException)
+    AMQ_CATCH_EXCEPTION_CONVERT(exceptions::ActiveMQException, decaf::io::IOException)
+    AMQ_CATCHALL_THROW(decaf::io::IOException)
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-int DataResponseMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) {
+int DataResponseMarshaller::tightMarshal1(OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs) {
 
     try {
 
         DataResponse* info =
-            dynamic_cast<DataResponse*>( dataStructure );
+            dynamic_cast<DataResponse*>(dataStructure);
 
-        int rc = ResponseMarshaller::tightMarshal1( wireFormat, dataStructure, bs );
-        rc += tightMarshalNestedObject1( wireFormat, info->getData().get(), bs );
+        int rc = ResponseMarshaller::tightMarshal1(wireFormat, dataStructure, bs);
+        rc += tightMarshalNestedObject1(wireFormat, info->getData().get(), bs);
 
         return rc + 0;
     }
-    AMQ_CATCH_RETHROW( decaf::io::IOException )
-    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
-    AMQ_CATCHALL_THROW( decaf::io::IOException )
+    AMQ_CATCH_RETHROW(decaf::io::IOException)
+    AMQ_CATCH_EXCEPTION_CONVERT(exceptions::ActiveMQException, decaf::io::IOException)
+    AMQ_CATCHALL_THROW(decaf::io::IOException)
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void DataResponseMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) {
+void DataResponseMarshaller::tightMarshal2(OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs) {
 
     try {
 
-        ResponseMarshaller::tightMarshal2( wireFormat, dataStructure, dataOut, bs );
+        ResponseMarshaller::tightMarshal2(wireFormat, dataStructure, dataOut, bs );
 
         DataResponse* info =
-            dynamic_cast<DataResponse*>( dataStructure );
-        tightMarshalNestedObject2( wireFormat, info->getData().get(), dataOut, bs );
+            dynamic_cast<DataResponse*>(dataStructure);
+        tightMarshalNestedObject2(wireFormat, info->getData().get(), dataOut, bs);
     }
-    AMQ_CATCH_RETHROW( decaf::io::IOException )
-    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
-    AMQ_CATCHALL_THROW( decaf::io::IOException )
+    AMQ_CATCH_RETHROW(decaf::io::IOException)
+    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException)
+    AMQ_CATCHALL_THROW(decaf::io::IOException)
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void DataResponseMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) {
+void DataResponseMarshaller::looseUnmarshal(OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn) {
 
     try {
 
-        ResponseMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
+        ResponseMarshaller::looseUnmarshal(wireFormat, dataStructure, dataIn);
         DataResponse* info =
-            dynamic_cast<DataResponse*>( dataStructure );
-        info->setData( Pointer<DataStructure>( dynamic_cast< DataStructure* >( 
-            looseUnmarshalNestedObject( wireFormat, dataIn ) ) ) );
+            dynamic_cast<DataResponse*>(dataStructure);
+        info->setData(Pointer<DataStructure>(dynamic_cast<DataStructure*>(
+            looseUnmarshalNestedObject(wireFormat, dataIn))));
     }
-    AMQ_CATCH_RETHROW( decaf::io::IOException )
-    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
-    AMQ_CATCHALL_THROW( decaf::io::IOException )
+    AMQ_CATCH_RETHROW(decaf::io::IOException)
+    AMQ_CATCH_EXCEPTION_CONVERT(exceptions::ActiveMQException, decaf::io::IOException)
+    AMQ_CATCHALL_THROW(decaf::io::IOException)
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void DataResponseMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) {
+void DataResponseMarshaller::looseMarshal(OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut) {
 
     try {
 
         DataResponse* info =
-            dynamic_cast<DataResponse*>( dataStructure );
-        ResponseMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
-        looseMarshalNestedObject( wireFormat, info->getData().get(), dataOut );
+            dynamic_cast<DataResponse*>(dataStructure);
+        ResponseMarshaller::looseMarshal(wireFormat, dataStructure, dataOut);
+        looseMarshalNestedObject(wireFormat, info->getData().get(), dataOut);
     }
-    AMQ_CATCH_RETHROW( decaf::io::IOException )
-    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
-    AMQ_CATCHALL_THROW( decaf::io::IOException )
+    AMQ_CATCH_RETHROW(decaf::io::IOException)
+    AMQ_CATCH_EXCEPTION_CONVERT(exceptions::ActiveMQException, decaf::io::IOException)
+    AMQ_CATCHALL_THROW(decaf::io::IOException)
 }
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/DataResponseMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/DataResponseMarshaller.h?rev=1460467&r1=1460466&r2=1460467&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/DataResponseMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/DataResponseMarshaller.h Sun Mar 24 21:30:52 2013
@@ -33,11 +33,11 @@
 #include <activemq/wireformat/openwire/OpenWireFormat.h>
 #include <activemq/wireformat/openwire/utils/BooleanStream.h>
 
-namespace activemq{
-namespace wireformat{
-namespace openwire{
-namespace marshal{
-namespace generated{
+namespace activemq {
+namespace wireformat {
+namespace openwire {
+namespace marshal {
+namespace generated {
 
     /**
      * Marshaling code for Open Wire Format for DataResponseMarshaller
@@ -56,27 +56,27 @@ namespace generated{
 
         virtual unsigned char getDataStructureType() const;
 
-        virtual void tightUnmarshal( OpenWireFormat* wireFormat,
-                                     commands::DataStructure* dataStructure,
-                                     decaf::io::DataInputStream* dataIn,
-                                     utils::BooleanStream* bs );
+        virtual void tightUnmarshal(OpenWireFormat* wireFormat,
+                                    commands::DataStructure* dataStructure,
+                                    decaf::io::DataInputStream* dataIn,
+                                    utils::BooleanStream* bs);
+
+        virtual int tightMarshal1(OpenWireFormat* wireFormat,
+                                  commands::DataStructure* dataStructure,
+                                  utils::BooleanStream* bs);
 
-        virtual int tightMarshal1( OpenWireFormat* wireFormat,
+        virtual void tightMarshal2(OpenWireFormat* wireFormat,
                                    commands::DataStructure* dataStructure,
-                                   utils::BooleanStream* bs );
+                                   decaf::io::DataOutputStream* dataOut,
+                                   utils::BooleanStream* bs);
 
-        virtual void tightMarshal2( OpenWireFormat* wireFormat,
+        virtual void looseUnmarshal(OpenWireFormat* wireFormat,
                                     commands::DataStructure* dataStructure,
-                                    decaf::io::DataOutputStream* dataOut,
-                                    utils::BooleanStream* bs );
+                                    decaf::io::DataInputStream* dataIn);
 
-        virtual void looseUnmarshal( OpenWireFormat* wireFormat,
-                                     commands::DataStructure* dataStructure,
-                                     decaf::io::DataInputStream* dataIn );
-
-        virtual void looseMarshal( OpenWireFormat* wireFormat,
-                                   commands::DataStructure* dataStructure,
-                                   decaf::io::DataOutputStream* dataOut );
+        virtual void looseMarshal(OpenWireFormat* wireFormat,
+                                  commands::DataStructure* dataStructure,
+                                  decaf::io::DataOutputStream* dataOut);
 
     };
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/DestinationInfoMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/DestinationInfoMarshaller.cpp?rev=1460467&r1=1460466&r2=1460467&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/DestinationInfoMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/DestinationInfoMarshaller.cpp Sun Mar 24 21:30:52 2013
@@ -51,125 +51,125 @@ unsigned char DestinationInfoMarshaller:
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void DestinationInfoMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) {
+void DestinationInfoMarshaller::tightUnmarshal(OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs) {
 
     try {
 
-        BaseCommandMarshaller::tightUnmarshal( wireFormat, dataStructure, dataIn, bs );
+        BaseCommandMarshaller::tightUnmarshal(wireFormat, dataStructure, dataIn, bs);
 
         DestinationInfo* info =
-            dynamic_cast<DestinationInfo*>( dataStructure );
-        info->setConnectionId( Pointer<ConnectionId>( dynamic_cast< ConnectionId* >(
-            tightUnmarshalCachedObject( wireFormat, dataIn, bs ) ) ) );
-        info->setDestination( Pointer<ActiveMQDestination>( dynamic_cast< ActiveMQDestination* >(
-            tightUnmarshalCachedObject( wireFormat, dataIn, bs ) ) ) );
-        info->setOperationType( dataIn->readByte() );
-        info->setTimeout( tightUnmarshalLong( wireFormat, dataIn, bs ) );
+            dynamic_cast<DestinationInfo*>(dataStructure);
+        info->setConnectionId(Pointer<ConnectionId>(dynamic_cast<ConnectionId* >(
+            tightUnmarshalCachedObject(wireFormat, dataIn, bs))));
+        info->setDestination(Pointer<ActiveMQDestination>(dynamic_cast<ActiveMQDestination* >(
+            tightUnmarshalCachedObject(wireFormat, dataIn, bs))));
+        info->setOperationType(dataIn->readByte());
+        info->setTimeout(tightUnmarshalLong(wireFormat, dataIn, bs));
 
-        if( bs->readBoolean() ) {
+        if (bs->readBoolean()) {
             short size = dataIn->readShort();
-            info->getBrokerPath().reserve( size );
-            for( int i = 0; i < size; i++ ) {
-                info->getBrokerPath().push_back( Pointer<BrokerId>( dynamic_cast< BrokerId* >(
-                    tightUnmarshalNestedObject( wireFormat, dataIn, bs ) ) ) );
+            info->getBrokerPath().reserve(size);
+            for (int i = 0; i < size; i++) {
+                info->getBrokerPath().push_back(Pointer<BrokerId>(dynamic_cast<BrokerId*>(
+                    tightUnmarshalNestedObject(wireFormat, dataIn, bs))));
             }
         } else {
             info->getBrokerPath().clear();
         }
     }
-    AMQ_CATCH_RETHROW( decaf::io::IOException )
-    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
-    AMQ_CATCHALL_THROW( decaf::io::IOException )
+    AMQ_CATCH_RETHROW(decaf::io::IOException)
+    AMQ_CATCH_EXCEPTION_CONVERT(exceptions::ActiveMQException, decaf::io::IOException)
+    AMQ_CATCHALL_THROW(decaf::io::IOException)
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-int DestinationInfoMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) {
+int DestinationInfoMarshaller::tightMarshal1(OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs) {
 
     try {
 
         DestinationInfo* info =
-            dynamic_cast<DestinationInfo*>( dataStructure );
+            dynamic_cast<DestinationInfo*>(dataStructure);
 
-        int rc = BaseCommandMarshaller::tightMarshal1( wireFormat, dataStructure, bs );
-        rc += tightMarshalCachedObject1( wireFormat, info->getConnectionId().get(), bs );
-        rc += tightMarshalCachedObject1( wireFormat, info->getDestination().get(), bs );
-        rc += tightMarshalLong1( wireFormat, info->getTimeout(), bs );
-        rc += tightMarshalObjectArray1( wireFormat, info->getBrokerPath(), bs );
+        int rc = BaseCommandMarshaller::tightMarshal1(wireFormat, dataStructure, bs);
+        rc += tightMarshalCachedObject1(wireFormat, info->getConnectionId().get(), bs);
+        rc += tightMarshalCachedObject1(wireFormat, info->getDestination().get(), bs);
+        rc += tightMarshalLong1(wireFormat, info->getTimeout(), bs);
+        rc += tightMarshalObjectArray1(wireFormat, info->getBrokerPath(), bs);
 
         return rc + 1;
     }
-    AMQ_CATCH_RETHROW( decaf::io::IOException )
-    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
-    AMQ_CATCHALL_THROW( decaf::io::IOException )
+    AMQ_CATCH_RETHROW(decaf::io::IOException)
+    AMQ_CATCH_EXCEPTION_CONVERT(exceptions::ActiveMQException, decaf::io::IOException)
+    AMQ_CATCHALL_THROW(decaf::io::IOException)
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void DestinationInfoMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) {
+void DestinationInfoMarshaller::tightMarshal2(OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs) {
 
     try {
 
-        BaseCommandMarshaller::tightMarshal2( wireFormat, dataStructure, dataOut, bs );
+        BaseCommandMarshaller::tightMarshal2(wireFormat, dataStructure, dataOut, bs );
 
         DestinationInfo* info =
-            dynamic_cast<DestinationInfo*>( dataStructure );
-        tightMarshalCachedObject2( wireFormat, info->getConnectionId().get(), dataOut, bs );
-        tightMarshalCachedObject2( wireFormat, info->getDestination().get(), dataOut, bs );
-        dataOut->write( info->getOperationType() );
-        tightMarshalLong2( wireFormat, info->getTimeout(), dataOut, bs );
-        tightMarshalObjectArray2( wireFormat, info->getBrokerPath(), dataOut, bs );
+            dynamic_cast<DestinationInfo*>(dataStructure);
+        tightMarshalCachedObject2(wireFormat, info->getConnectionId().get(), dataOut, bs);
+        tightMarshalCachedObject2(wireFormat, info->getDestination().get(), dataOut, bs);
+        dataOut->write(info->getOperationType());
+        tightMarshalLong2(wireFormat, info->getTimeout(), dataOut, bs);
+        tightMarshalObjectArray2(wireFormat, info->getBrokerPath(), dataOut, bs);
     }
-    AMQ_CATCH_RETHROW( decaf::io::IOException )
-    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
-    AMQ_CATCHALL_THROW( decaf::io::IOException )
+    AMQ_CATCH_RETHROW(decaf::io::IOException)
+    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException)
+    AMQ_CATCHALL_THROW(decaf::io::IOException)
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void DestinationInfoMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) {
+void DestinationInfoMarshaller::looseUnmarshal(OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn) {
 
     try {
 
-        BaseCommandMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
+        BaseCommandMarshaller::looseUnmarshal(wireFormat, dataStructure, dataIn);
         DestinationInfo* info =
-            dynamic_cast<DestinationInfo*>( dataStructure );
-        info->setConnectionId( Pointer<ConnectionId>( dynamic_cast< ConnectionId* >( 
-            looseUnmarshalCachedObject( wireFormat, dataIn ) ) ) );
-        info->setDestination( Pointer<ActiveMQDestination>( dynamic_cast< ActiveMQDestination* >( 
-            looseUnmarshalCachedObject( wireFormat, dataIn ) ) ) );
-        info->setOperationType( dataIn->readByte() );
-        info->setTimeout( looseUnmarshalLong( wireFormat, dataIn ) );
+            dynamic_cast<DestinationInfo*>(dataStructure);
+        info->setConnectionId(Pointer<ConnectionId>(dynamic_cast<ConnectionId*>(
+            looseUnmarshalCachedObject(wireFormat, dataIn))));
+        info->setDestination(Pointer<ActiveMQDestination>(dynamic_cast<ActiveMQDestination*>(
+            looseUnmarshalCachedObject(wireFormat, dataIn))));
+        info->setOperationType(dataIn->readByte());
+        info->setTimeout(looseUnmarshalLong(wireFormat, dataIn));
 
-        if( dataIn->readBoolean() ) {
+        if (dataIn->readBoolean()) {
             short size = dataIn->readShort();
-            info->getBrokerPath().reserve( size );
-            for( int i = 0; i < size; i++ ) {
-                info->getBrokerPath().push_back( Pointer<BrokerId>( dynamic_cast<BrokerId* >(
-                    looseUnmarshalNestedObject( wireFormat, dataIn ) ) ) );
+            info->getBrokerPath().reserve(size);
+            for (int i = 0; i < size; i++) {
+                info->getBrokerPath().push_back( Pointer<BrokerId>(dynamic_cast<BrokerId*>(
+                    looseUnmarshalNestedObject(wireFormat, dataIn))));
             }
         } else {
             info->getBrokerPath().clear();
         }
     }
-    AMQ_CATCH_RETHROW( decaf::io::IOException )
-    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
-    AMQ_CATCHALL_THROW( decaf::io::IOException )
+    AMQ_CATCH_RETHROW(decaf::io::IOException)
+    AMQ_CATCH_EXCEPTION_CONVERT(exceptions::ActiveMQException, decaf::io::IOException)
+    AMQ_CATCHALL_THROW(decaf::io::IOException)
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void DestinationInfoMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) {
+void DestinationInfoMarshaller::looseMarshal(OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut) {
 
     try {
 
         DestinationInfo* info =
-            dynamic_cast<DestinationInfo*>( dataStructure );
-        BaseCommandMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
-        looseMarshalCachedObject( wireFormat, info->getConnectionId().get(), dataOut );
-        looseMarshalCachedObject( wireFormat, info->getDestination().get(), dataOut );
-        dataOut->write( info->getOperationType() );
-        looseMarshalLong( wireFormat, info->getTimeout(), dataOut );
-        looseMarshalObjectArray( wireFormat, info->getBrokerPath(), dataOut );
+            dynamic_cast<DestinationInfo*>(dataStructure);
+        BaseCommandMarshaller::looseMarshal(wireFormat, dataStructure, dataOut);
+        looseMarshalCachedObject(wireFormat, info->getConnectionId().get(), dataOut);
+        looseMarshalCachedObject(wireFormat, info->getDestination().get(), dataOut);
+        dataOut->write(info->getOperationType());
+        looseMarshalLong(wireFormat, info->getTimeout(), dataOut);
+        looseMarshalObjectArray(wireFormat, info->getBrokerPath(), dataOut);
     }
-    AMQ_CATCH_RETHROW( decaf::io::IOException )
-    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
-    AMQ_CATCHALL_THROW( decaf::io::IOException )
+    AMQ_CATCH_RETHROW(decaf::io::IOException)
+    AMQ_CATCH_EXCEPTION_CONVERT(exceptions::ActiveMQException, decaf::io::IOException)
+    AMQ_CATCHALL_THROW(decaf::io::IOException)
 }
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/DestinationInfoMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/DestinationInfoMarshaller.h?rev=1460467&r1=1460466&r2=1460467&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/DestinationInfoMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/DestinationInfoMarshaller.h Sun Mar 24 21:30:52 2013
@@ -33,11 +33,11 @@
 #include <activemq/wireformat/openwire/OpenWireFormat.h>
 #include <activemq/wireformat/openwire/utils/BooleanStream.h>
 
-namespace activemq{
-namespace wireformat{
-namespace openwire{
-namespace marshal{
-namespace generated{
+namespace activemq {
+namespace wireformat {
+namespace openwire {
+namespace marshal {
+namespace generated {
 
     /**
      * Marshaling code for Open Wire Format for DestinationInfoMarshaller
@@ -56,27 +56,27 @@ namespace generated{
 
         virtual unsigned char getDataStructureType() const;
 
-        virtual void tightUnmarshal( OpenWireFormat* wireFormat,
-                                     commands::DataStructure* dataStructure,
-                                     decaf::io::DataInputStream* dataIn,
-                                     utils::BooleanStream* bs );
+        virtual void tightUnmarshal(OpenWireFormat* wireFormat,
+                                    commands::DataStructure* dataStructure,
+                                    decaf::io::DataInputStream* dataIn,
+                                    utils::BooleanStream* bs);
+
+        virtual int tightMarshal1(OpenWireFormat* wireFormat,
+                                  commands::DataStructure* dataStructure,
+                                  utils::BooleanStream* bs);
 
-        virtual int tightMarshal1( OpenWireFormat* wireFormat,
+        virtual void tightMarshal2(OpenWireFormat* wireFormat,
                                    commands::DataStructure* dataStructure,
-                                   utils::BooleanStream* bs );
+                                   decaf::io::DataOutputStream* dataOut,
+                                   utils::BooleanStream* bs);
 
-        virtual void tightMarshal2( OpenWireFormat* wireFormat,
+        virtual void looseUnmarshal(OpenWireFormat* wireFormat,
                                     commands::DataStructure* dataStructure,
-                                    decaf::io::DataOutputStream* dataOut,
-                                    utils::BooleanStream* bs );
+                                    decaf::io::DataInputStream* dataIn);
 
-        virtual void looseUnmarshal( OpenWireFormat* wireFormat,
-                                     commands::DataStructure* dataStructure,
-                                     decaf::io::DataInputStream* dataIn );
-
-        virtual void looseMarshal( OpenWireFormat* wireFormat,
-                                   commands::DataStructure* dataStructure,
-                                   decaf::io::DataOutputStream* dataOut );
+        virtual void looseMarshal(OpenWireFormat* wireFormat,
+                                  commands::DataStructure* dataStructure,
+                                  decaf::io::DataOutputStream* dataOut);
 
     };
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/DiscoveryEventMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/DiscoveryEventMarshaller.cpp?rev=1460467&r1=1460466&r2=1460467&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/DiscoveryEventMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/DiscoveryEventMarshaller.cpp Sun Mar 24 21:30:52 2013
@@ -51,87 +51,87 @@ unsigned char DiscoveryEventMarshaller::
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void DiscoveryEventMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) {
+void DiscoveryEventMarshaller::tightUnmarshal(OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs) {
 
     try {
 
-        BaseDataStreamMarshaller::tightUnmarshal( wireFormat, dataStructure, dataIn, bs );
+        BaseDataStreamMarshaller::tightUnmarshal(wireFormat, dataStructure, dataIn, bs);
 
         DiscoveryEvent* info =
-            dynamic_cast<DiscoveryEvent*>( dataStructure );
-        info->setServiceName( tightUnmarshalString( dataIn, bs ) );
-        info->setBrokerName( tightUnmarshalString( dataIn, bs ) );
+            dynamic_cast<DiscoveryEvent*>(dataStructure);
+        info->setServiceName(tightUnmarshalString(dataIn, bs));
+        info->setBrokerName(tightUnmarshalString(dataIn, bs));
     }
-    AMQ_CATCH_RETHROW( decaf::io::IOException )
-    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
-    AMQ_CATCHALL_THROW( decaf::io::IOException )
+    AMQ_CATCH_RETHROW(decaf::io::IOException)
+    AMQ_CATCH_EXCEPTION_CONVERT(exceptions::ActiveMQException, decaf::io::IOException)
+    AMQ_CATCHALL_THROW(decaf::io::IOException)
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-int DiscoveryEventMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) {
+int DiscoveryEventMarshaller::tightMarshal1(OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs) {
 
     try {
 
         DiscoveryEvent* info =
-            dynamic_cast<DiscoveryEvent*>( dataStructure );
+            dynamic_cast<DiscoveryEvent*>(dataStructure);
 
-        int rc = BaseDataStreamMarshaller::tightMarshal1( wireFormat, dataStructure, bs );
-        rc += tightMarshalString1( info->getServiceName(), bs );
-        rc += tightMarshalString1( info->getBrokerName(), bs );
+        int rc = BaseDataStreamMarshaller::tightMarshal1(wireFormat, dataStructure, bs);
+        rc += tightMarshalString1(info->getServiceName(), bs);
+        rc += tightMarshalString1(info->getBrokerName(), bs);
 
         return rc + 0;
     }
-    AMQ_CATCH_RETHROW( decaf::io::IOException )
-    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
-    AMQ_CATCHALL_THROW( decaf::io::IOException )
+    AMQ_CATCH_RETHROW(decaf::io::IOException)
+    AMQ_CATCH_EXCEPTION_CONVERT(exceptions::ActiveMQException, decaf::io::IOException)
+    AMQ_CATCHALL_THROW(decaf::io::IOException)
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void DiscoveryEventMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) {
+void DiscoveryEventMarshaller::tightMarshal2(OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs) {
 
     try {
 
-        BaseDataStreamMarshaller::tightMarshal2( wireFormat, dataStructure, dataOut, bs );
+        BaseDataStreamMarshaller::tightMarshal2(wireFormat, dataStructure, dataOut, bs );
 
         DiscoveryEvent* info =
-            dynamic_cast<DiscoveryEvent*>( dataStructure );
-        tightMarshalString2( info->getServiceName(), dataOut, bs );
-        tightMarshalString2( info->getBrokerName(), dataOut, bs );
+            dynamic_cast<DiscoveryEvent*>(dataStructure);
+        tightMarshalString2(info->getServiceName(), dataOut, bs);
+        tightMarshalString2(info->getBrokerName(), dataOut, bs);
     }
-    AMQ_CATCH_RETHROW( decaf::io::IOException )
-    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
-    AMQ_CATCHALL_THROW( decaf::io::IOException )
+    AMQ_CATCH_RETHROW(decaf::io::IOException)
+    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException)
+    AMQ_CATCHALL_THROW(decaf::io::IOException)
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void DiscoveryEventMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) {
+void DiscoveryEventMarshaller::looseUnmarshal(OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn) {
 
     try {
 
-        BaseDataStreamMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
+        BaseDataStreamMarshaller::looseUnmarshal(wireFormat, dataStructure, dataIn);
         DiscoveryEvent* info =
-            dynamic_cast<DiscoveryEvent*>( dataStructure );
-        info->setServiceName( looseUnmarshalString( dataIn ) );
-        info->setBrokerName( looseUnmarshalString( dataIn ) );
+            dynamic_cast<DiscoveryEvent*>(dataStructure);
+        info->setServiceName(looseUnmarshalString(dataIn));
+        info->setBrokerName(looseUnmarshalString(dataIn));
     }
-    AMQ_CATCH_RETHROW( decaf::io::IOException )
-    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
-    AMQ_CATCHALL_THROW( decaf::io::IOException )
+    AMQ_CATCH_RETHROW(decaf::io::IOException)
+    AMQ_CATCH_EXCEPTION_CONVERT(exceptions::ActiveMQException, decaf::io::IOException)
+    AMQ_CATCHALL_THROW(decaf::io::IOException)
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void DiscoveryEventMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) {
+void DiscoveryEventMarshaller::looseMarshal(OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut) {
 
     try {
 
         DiscoveryEvent* info =
-            dynamic_cast<DiscoveryEvent*>( dataStructure );
-        BaseDataStreamMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
-        looseMarshalString( info->getServiceName(), dataOut );
-        looseMarshalString( info->getBrokerName(), dataOut );
+            dynamic_cast<DiscoveryEvent*>(dataStructure);
+        BaseDataStreamMarshaller::looseMarshal(wireFormat, dataStructure, dataOut);
+        looseMarshalString(info->getServiceName(), dataOut);
+        looseMarshalString(info->getBrokerName(), dataOut);
     }
-    AMQ_CATCH_RETHROW( decaf::io::IOException )
-    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
-    AMQ_CATCHALL_THROW( decaf::io::IOException )
+    AMQ_CATCH_RETHROW(decaf::io::IOException)
+    AMQ_CATCH_EXCEPTION_CONVERT(exceptions::ActiveMQException, decaf::io::IOException)
+    AMQ_CATCHALL_THROW(decaf::io::IOException)
 }
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/DiscoveryEventMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/DiscoveryEventMarshaller.h?rev=1460467&r1=1460466&r2=1460467&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/DiscoveryEventMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/DiscoveryEventMarshaller.h Sun Mar 24 21:30:52 2013
@@ -33,11 +33,11 @@
 #include <activemq/wireformat/openwire/OpenWireFormat.h>
 #include <activemq/wireformat/openwire/utils/BooleanStream.h>
 
-namespace activemq{
-namespace wireformat{
-namespace openwire{
-namespace marshal{
-namespace generated{
+namespace activemq {
+namespace wireformat {
+namespace openwire {
+namespace marshal {
+namespace generated {
 
     /**
      * Marshaling code for Open Wire Format for DiscoveryEventMarshaller
@@ -56,27 +56,27 @@ namespace generated{
 
         virtual unsigned char getDataStructureType() const;
 
-        virtual void tightUnmarshal( OpenWireFormat* wireFormat,
-                                     commands::DataStructure* dataStructure,
-                                     decaf::io::DataInputStream* dataIn,
-                                     utils::BooleanStream* bs );
+        virtual void tightUnmarshal(OpenWireFormat* wireFormat,
+                                    commands::DataStructure* dataStructure,
+                                    decaf::io::DataInputStream* dataIn,
+                                    utils::BooleanStream* bs);
+
+        virtual int tightMarshal1(OpenWireFormat* wireFormat,
+                                  commands::DataStructure* dataStructure,
+                                  utils::BooleanStream* bs);
 
-        virtual int tightMarshal1( OpenWireFormat* wireFormat,
+        virtual void tightMarshal2(OpenWireFormat* wireFormat,
                                    commands::DataStructure* dataStructure,
-                                   utils::BooleanStream* bs );
+                                   decaf::io::DataOutputStream* dataOut,
+                                   utils::BooleanStream* bs);
 
-        virtual void tightMarshal2( OpenWireFormat* wireFormat,
+        virtual void looseUnmarshal(OpenWireFormat* wireFormat,
                                     commands::DataStructure* dataStructure,
-                                    decaf::io::DataOutputStream* dataOut,
-                                    utils::BooleanStream* bs );
+                                    decaf::io::DataInputStream* dataIn);
 
-        virtual void looseUnmarshal( OpenWireFormat* wireFormat,
-                                     commands::DataStructure* dataStructure,
-                                     decaf::io::DataInputStream* dataIn );
-
-        virtual void looseMarshal( OpenWireFormat* wireFormat,
-                                   commands::DataStructure* dataStructure,
-                                   decaf::io::DataOutputStream* dataOut );
+        virtual void looseMarshal(OpenWireFormat* wireFormat,
+                                  commands::DataStructure* dataStructure,
+                                  decaf::io::DataOutputStream* dataOut);
 
     };
 



Mime
View raw message