activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r1460467 [14/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/ProducerIdMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ProducerIdMarshaller.cpp?rev=1460467&r1=1460466&r2=1460467&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ProducerIdMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ProducerIdMarshaller.cpp Sun Mar 24 21:30:52 2013
@@ -51,92 +51,92 @@ unsigned char ProducerIdMarshaller::getD
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void ProducerIdMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) {
+void ProducerIdMarshaller::tightUnmarshal(OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs) {
 
     try {
 
-        BaseDataStreamMarshaller::tightUnmarshal( wireFormat, dataStructure, dataIn, bs );
+        BaseDataStreamMarshaller::tightUnmarshal(wireFormat, dataStructure, dataIn, bs);
 
         ProducerId* info =
-            dynamic_cast<ProducerId*>( dataStructure );
-        info->setConnectionId( tightUnmarshalString( dataIn, bs ) );
-        info->setValue( tightUnmarshalLong( wireFormat, dataIn, bs ) );
-        info->setSessionId( tightUnmarshalLong( wireFormat, dataIn, bs ) );
+            dynamic_cast<ProducerId*>(dataStructure);
+        info->setConnectionId(tightUnmarshalString(dataIn, bs));
+        info->setValue(tightUnmarshalLong(wireFormat, dataIn, bs));
+        info->setSessionId(tightUnmarshalLong(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 ProducerIdMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) {
+int ProducerIdMarshaller::tightMarshal1(OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs) {
 
     try {
 
         ProducerId* info =
-            dynamic_cast<ProducerId*>( dataStructure );
+            dynamic_cast<ProducerId*>(dataStructure);
 
-        int rc = BaseDataStreamMarshaller::tightMarshal1( wireFormat, dataStructure, bs );
-        rc += tightMarshalString1( info->getConnectionId(), bs );
-        rc += tightMarshalLong1( wireFormat, info->getValue(), bs );
-        rc += tightMarshalLong1( wireFormat, info->getSessionId(), bs );
+        int rc = BaseDataStreamMarshaller::tightMarshal1(wireFormat, dataStructure, bs);
+        rc += tightMarshalString1(info->getConnectionId(), bs);
+        rc += tightMarshalLong1(wireFormat, info->getValue(), bs);
+        rc += tightMarshalLong1(wireFormat, info->getSessionId(), 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 ProducerIdMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) {
+void ProducerIdMarshaller::tightMarshal2(OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs) {
 
     try {
 
-        BaseDataStreamMarshaller::tightMarshal2( wireFormat, dataStructure, dataOut, bs );
+        BaseDataStreamMarshaller::tightMarshal2(wireFormat, dataStructure, dataOut, bs );
 
         ProducerId* info =
-            dynamic_cast<ProducerId*>( dataStructure );
-        tightMarshalString2( info->getConnectionId(), dataOut, bs );
-        tightMarshalLong2( wireFormat, info->getValue(), dataOut, bs );
-        tightMarshalLong2( wireFormat, info->getSessionId(), dataOut, bs );
+            dynamic_cast<ProducerId*>(dataStructure);
+        tightMarshalString2(info->getConnectionId(), dataOut, bs);
+        tightMarshalLong2(wireFormat, info->getValue(), dataOut, bs);
+        tightMarshalLong2(wireFormat, info->getSessionId(), 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 ProducerIdMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) {
+void ProducerIdMarshaller::looseUnmarshal(OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn) {
 
     try {
 
-        BaseDataStreamMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
+        BaseDataStreamMarshaller::looseUnmarshal(wireFormat, dataStructure, dataIn);
         ProducerId* info =
-            dynamic_cast<ProducerId*>( dataStructure );
-        info->setConnectionId( looseUnmarshalString( dataIn ) );
-        info->setValue( looseUnmarshalLong( wireFormat, dataIn ) );
-        info->setSessionId( looseUnmarshalLong( wireFormat, dataIn ) );
+            dynamic_cast<ProducerId*>(dataStructure);
+        info->setConnectionId(looseUnmarshalString(dataIn));
+        info->setValue(looseUnmarshalLong(wireFormat, dataIn));
+        info->setSessionId(looseUnmarshalLong(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 ProducerIdMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) {
+void ProducerIdMarshaller::looseMarshal(OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut) {
 
     try {
 
         ProducerId* info =
-            dynamic_cast<ProducerId*>( dataStructure );
-        BaseDataStreamMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
-        looseMarshalString( info->getConnectionId(), dataOut );
-        looseMarshalLong( wireFormat, info->getValue(), dataOut );
-        looseMarshalLong( wireFormat, info->getSessionId(), dataOut );
+            dynamic_cast<ProducerId*>(dataStructure);
+        BaseDataStreamMarshaller::looseMarshal(wireFormat, dataStructure, dataOut);
+        looseMarshalString(info->getConnectionId(), dataOut);
+        looseMarshalLong(wireFormat, info->getValue(), dataOut);
+        looseMarshalLong(wireFormat, info->getSessionId(), 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/ProducerIdMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ProducerIdMarshaller.h?rev=1460467&r1=1460466&r2=1460467&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ProducerIdMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ProducerIdMarshaller.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 ProducerIdMarshaller
@@ -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/ProducerInfoMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ProducerInfoMarshaller.cpp?rev=1460467&r1=1460466&r2=1460467&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ProducerInfoMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ProducerInfoMarshaller.cpp Sun Mar 24 21:30:52 2013
@@ -51,160 +51,160 @@ unsigned char ProducerInfoMarshaller::ge
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void ProducerInfoMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) {
+void ProducerInfoMarshaller::tightUnmarshal(OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs) {
 
     try {
 
-        BaseCommandMarshaller::tightUnmarshal( wireFormat, dataStructure, dataIn, bs );
+        BaseCommandMarshaller::tightUnmarshal(wireFormat, dataStructure, dataIn, bs);
 
         ProducerInfo* info =
-            dynamic_cast<ProducerInfo*>( dataStructure );
+            dynamic_cast<ProducerInfo*>(dataStructure);
 
         int wireVersion = wireFormat->getVersion();
 
-        info->setProducerId( Pointer<ProducerId>( dynamic_cast< ProducerId* >(
-            tightUnmarshalCachedObject( wireFormat, dataIn, bs ) ) ) );
-        info->setDestination( Pointer<ActiveMQDestination>( dynamic_cast< ActiveMQDestination* >(
-            tightUnmarshalCachedObject( wireFormat, dataIn, bs ) ) ) );
+        info->setProducerId(Pointer<ProducerId>(dynamic_cast<ProducerId* >(
+            tightUnmarshalCachedObject(wireFormat, dataIn, bs))));
+        info->setDestination(Pointer<ActiveMQDestination>(dynamic_cast<ActiveMQDestination* >(
+            tightUnmarshalCachedObject(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();
         }
-        if( wireVersion >= 2 ) {
-            info->setDispatchAsync( bs->readBoolean() );
+        if (wireVersion >= 2) {
+            info->setDispatchAsync(bs->readBoolean());
         }
-        if( wireVersion >= 3 ) {
-            info->setWindowSize( dataIn->readInt() );
+        if (wireVersion >= 3) {
+            info->setWindowSize(dataIn->readInt());
         }
     }
-    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 ProducerInfoMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) {
+int ProducerInfoMarshaller::tightMarshal1(OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs) {
 
     try {
 
         ProducerInfo* info =
-            dynamic_cast<ProducerInfo*>( dataStructure );
+            dynamic_cast<ProducerInfo*>(dataStructure);
 
-        int rc = BaseCommandMarshaller::tightMarshal1( wireFormat, dataStructure, bs );
+        int rc = BaseCommandMarshaller::tightMarshal1(wireFormat, dataStructure, bs);
 
         int wireVersion = wireFormat->getVersion();
 
-        rc += tightMarshalCachedObject1( wireFormat, info->getProducerId().get(), bs );
-        rc += tightMarshalCachedObject1( wireFormat, info->getDestination().get(), bs );
-        rc += tightMarshalObjectArray1( wireFormat, info->getBrokerPath(), bs );
-        if( wireVersion >= 2 ) {
-            bs->writeBoolean( info->isDispatchAsync() );
+        rc += tightMarshalCachedObject1(wireFormat, info->getProducerId().get(), bs);
+        rc += tightMarshalCachedObject1(wireFormat, info->getDestination().get(), bs);
+        rc += tightMarshalObjectArray1(wireFormat, info->getBrokerPath(), bs);
+        if (wireVersion >= 2) {
+            bs->writeBoolean(info->isDispatchAsync());
         }
-        if( wireVersion >= 3 ) {
+        if (wireVersion >= 3) {
         }
 
         return rc + 4;
     }
-    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 ProducerInfoMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) {
+void ProducerInfoMarshaller::tightMarshal2(OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs) {
 
     try {
 
-        BaseCommandMarshaller::tightMarshal2( wireFormat, dataStructure, dataOut, bs );
+        BaseCommandMarshaller::tightMarshal2(wireFormat, dataStructure, dataOut, bs );
 
         ProducerInfo* info =
-            dynamic_cast<ProducerInfo*>( dataStructure );
+            dynamic_cast<ProducerInfo*>(dataStructure);
 
         int wireVersion = wireFormat->getVersion();
 
-        tightMarshalCachedObject2( wireFormat, info->getProducerId().get(), dataOut, bs );
-        tightMarshalCachedObject2( wireFormat, info->getDestination().get(), dataOut, bs );
-        tightMarshalObjectArray2( wireFormat, info->getBrokerPath(), dataOut, bs );
-        if( wireVersion >= 2 ) {
+        tightMarshalCachedObject2(wireFormat, info->getProducerId().get(), dataOut, bs);
+        tightMarshalCachedObject2(wireFormat, info->getDestination().get(), dataOut, bs);
+        tightMarshalObjectArray2(wireFormat, info->getBrokerPath(), dataOut, bs);
+        if (wireVersion >= 2) {
             bs->readBoolean();
         }
-        if( wireVersion >= 3 ) {
-            dataOut->writeInt( info->getWindowSize() );
+        if (wireVersion >= 3) {
+            dataOut->writeInt(info->getWindowSize());
         }
     }
-    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 ProducerInfoMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) {
+void ProducerInfoMarshaller::looseUnmarshal(OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn) {
 
     try {
 
-        BaseCommandMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
+        BaseCommandMarshaller::looseUnmarshal(wireFormat, dataStructure, dataIn);
         ProducerInfo* info =
-            dynamic_cast<ProducerInfo*>( dataStructure );
+            dynamic_cast<ProducerInfo*>(dataStructure);
 
         int wireVersion = wireFormat->getVersion();
 
-        info->setProducerId( Pointer<ProducerId>( dynamic_cast< ProducerId* >( 
-            looseUnmarshalCachedObject( wireFormat, dataIn ) ) ) );
-        info->setDestination( Pointer<ActiveMQDestination>( dynamic_cast< ActiveMQDestination* >( 
-            looseUnmarshalCachedObject( wireFormat, dataIn ) ) ) );
+        info->setProducerId(Pointer<ProducerId>(dynamic_cast<ProducerId*>(
+            looseUnmarshalCachedObject(wireFormat, dataIn))));
+        info->setDestination(Pointer<ActiveMQDestination>(dynamic_cast<ActiveMQDestination*>(
+            looseUnmarshalCachedObject(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();
         }
-        if( wireVersion >= 2 ) {
-            info->setDispatchAsync( dataIn->readBoolean() );
+        if (wireVersion >= 2) {
+            info->setDispatchAsync(dataIn->readBoolean());
         }
-        if( wireVersion >= 3 ) {
-            info->setWindowSize( dataIn->readInt() );
+        if (wireVersion >= 3) {
+            info->setWindowSize(dataIn->readInt());
         }
     }
-    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 ProducerInfoMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) {
+void ProducerInfoMarshaller::looseMarshal(OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut) {
 
     try {
 
         ProducerInfo* info =
-            dynamic_cast<ProducerInfo*>( dataStructure );
-        BaseCommandMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
+            dynamic_cast<ProducerInfo*>(dataStructure);
+        BaseCommandMarshaller::looseMarshal(wireFormat, dataStructure, dataOut);
 
         int wireVersion = wireFormat->getVersion();
 
-        looseMarshalCachedObject( wireFormat, info->getProducerId().get(), dataOut );
-        looseMarshalCachedObject( wireFormat, info->getDestination().get(), dataOut );
-        looseMarshalObjectArray( wireFormat, info->getBrokerPath(), dataOut );
-        if( wireVersion >= 2 ) {
-            dataOut->writeBoolean( info->isDispatchAsync() );
+        looseMarshalCachedObject(wireFormat, info->getProducerId().get(), dataOut);
+        looseMarshalCachedObject(wireFormat, info->getDestination().get(), dataOut);
+        looseMarshalObjectArray(wireFormat, info->getBrokerPath(), dataOut);
+        if (wireVersion >= 2) {
+            dataOut->writeBoolean(info->isDispatchAsync());
         }
-        if( wireVersion >= 3 ) {
-            dataOut->writeInt( info->getWindowSize() );
+        if (wireVersion >= 3) {
+            dataOut->writeInt(info->getWindowSize());
         }
     }
-    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/ProducerInfoMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ProducerInfoMarshaller.h?rev=1460467&r1=1460466&r2=1460467&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ProducerInfoMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ProducerInfoMarshaller.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 ProducerInfoMarshaller
@@ -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/RemoveInfoMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/RemoveInfoMarshaller.cpp?rev=1460467&r1=1460466&r2=1460467&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/RemoveInfoMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/RemoveInfoMarshaller.cpp Sun Mar 24 21:30:52 2013
@@ -51,114 +51,114 @@ unsigned char RemoveInfoMarshaller::getD
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void RemoveInfoMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) {
+void RemoveInfoMarshaller::tightUnmarshal(OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs) {
 
     try {
 
-        BaseCommandMarshaller::tightUnmarshal( wireFormat, dataStructure, dataIn, bs );
+        BaseCommandMarshaller::tightUnmarshal(wireFormat, dataStructure, dataIn, bs);
 
         RemoveInfo* info =
-            dynamic_cast<RemoveInfo*>( dataStructure );
+            dynamic_cast<RemoveInfo*>(dataStructure);
 
         int wireVersion = wireFormat->getVersion();
 
-        info->setObjectId( Pointer<DataStructure>( dynamic_cast< DataStructure* >(
-            tightUnmarshalCachedObject( wireFormat, dataIn, bs ) ) ) );
-        if( wireVersion >= 5 ) {
-            info->setLastDeliveredSequenceId( tightUnmarshalLong( wireFormat, dataIn, bs ) );
+        info->setObjectId(Pointer<DataStructure>(dynamic_cast<DataStructure* >(
+            tightUnmarshalCachedObject(wireFormat, dataIn, bs))));
+        if (wireVersion >= 5) {
+            info->setLastDeliveredSequenceId(tightUnmarshalLong(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 RemoveInfoMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) {
+int RemoveInfoMarshaller::tightMarshal1(OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs) {
 
     try {
 
         RemoveInfo* info =
-            dynamic_cast<RemoveInfo*>( dataStructure );
+            dynamic_cast<RemoveInfo*>(dataStructure);
 
-        int rc = BaseCommandMarshaller::tightMarshal1( wireFormat, dataStructure, bs );
+        int rc = BaseCommandMarshaller::tightMarshal1(wireFormat, dataStructure, bs);
 
         int wireVersion = wireFormat->getVersion();
 
-        rc += tightMarshalCachedObject1( wireFormat, info->getObjectId().get(), bs );
-        if( wireVersion >= 5 ) {
-            rc += tightMarshalLong1( wireFormat, info->getLastDeliveredSequenceId(), bs );
+        rc += tightMarshalCachedObject1(wireFormat, info->getObjectId().get(), bs);
+        if (wireVersion >= 5) {
+            rc += tightMarshalLong1(wireFormat, info->getLastDeliveredSequenceId(), 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 RemoveInfoMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) {
+void RemoveInfoMarshaller::tightMarshal2(OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs) {
 
     try {
 
-        BaseCommandMarshaller::tightMarshal2( wireFormat, dataStructure, dataOut, bs );
+        BaseCommandMarshaller::tightMarshal2(wireFormat, dataStructure, dataOut, bs );
 
         RemoveInfo* info =
-            dynamic_cast<RemoveInfo*>( dataStructure );
+            dynamic_cast<RemoveInfo*>(dataStructure);
 
         int wireVersion = wireFormat->getVersion();
 
-        tightMarshalCachedObject2( wireFormat, info->getObjectId().get(), dataOut, bs );
-        if( wireVersion >= 5 ) {
-            tightMarshalLong2( wireFormat, info->getLastDeliveredSequenceId(), dataOut, bs );
+        tightMarshalCachedObject2(wireFormat, info->getObjectId().get(), dataOut, bs);
+        if (wireVersion >= 5) {
+            tightMarshalLong2(wireFormat, info->getLastDeliveredSequenceId(), 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 RemoveInfoMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) {
+void RemoveInfoMarshaller::looseUnmarshal(OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn) {
 
     try {
 
-        BaseCommandMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
+        BaseCommandMarshaller::looseUnmarshal(wireFormat, dataStructure, dataIn);
         RemoveInfo* info =
-            dynamic_cast<RemoveInfo*>( dataStructure );
+            dynamic_cast<RemoveInfo*>(dataStructure);
 
         int wireVersion = wireFormat->getVersion();
 
-        info->setObjectId( Pointer<DataStructure>( dynamic_cast< DataStructure* >( 
-            looseUnmarshalCachedObject( wireFormat, dataIn ) ) ) );
-        if( wireVersion >= 5 ) {
-            info->setLastDeliveredSequenceId( looseUnmarshalLong( wireFormat, dataIn ) );
+        info->setObjectId(Pointer<DataStructure>(dynamic_cast<DataStructure*>(
+            looseUnmarshalCachedObject(wireFormat, dataIn))));
+        if (wireVersion >= 5) {
+            info->setLastDeliveredSequenceId(looseUnmarshalLong(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 RemoveInfoMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) {
+void RemoveInfoMarshaller::looseMarshal(OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut) {
 
     try {
 
         RemoveInfo* info =
-            dynamic_cast<RemoveInfo*>( dataStructure );
-        BaseCommandMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
+            dynamic_cast<RemoveInfo*>(dataStructure);
+        BaseCommandMarshaller::looseMarshal(wireFormat, dataStructure, dataOut);
 
         int wireVersion = wireFormat->getVersion();
 
-        looseMarshalCachedObject( wireFormat, info->getObjectId().get(), dataOut );
-        if( wireVersion >= 5 ) {
-            looseMarshalLong( wireFormat, info->getLastDeliveredSequenceId(), dataOut );
+        looseMarshalCachedObject(wireFormat, info->getObjectId().get(), dataOut);
+        if (wireVersion >= 5) {
+            looseMarshalLong(wireFormat, info->getLastDeliveredSequenceId(), 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/RemoveInfoMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/RemoveInfoMarshaller.h?rev=1460467&r1=1460466&r2=1460467&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/RemoveInfoMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/RemoveInfoMarshaller.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 RemoveInfoMarshaller
@@ -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/RemoveSubscriptionInfoMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/RemoveSubscriptionInfoMarshaller.cpp?rev=1460467&r1=1460466&r2=1460467&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/RemoveSubscriptionInfoMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/RemoveSubscriptionInfoMarshaller.cpp Sun Mar 24 21:30:52 2013
@@ -51,94 +51,94 @@ unsigned char RemoveSubscriptionInfoMars
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void RemoveSubscriptionInfoMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) {
+void RemoveSubscriptionInfoMarshaller::tightUnmarshal(OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs) {
 
     try {
 
-        BaseCommandMarshaller::tightUnmarshal( wireFormat, dataStructure, dataIn, bs );
+        BaseCommandMarshaller::tightUnmarshal(wireFormat, dataStructure, dataIn, bs);
 
         RemoveSubscriptionInfo* info =
-            dynamic_cast<RemoveSubscriptionInfo*>( dataStructure );
-        info->setConnectionId( Pointer<ConnectionId>( dynamic_cast< ConnectionId* >(
-            tightUnmarshalCachedObject( wireFormat, dataIn, bs ) ) ) );
-        info->setSubcriptionName( tightUnmarshalString( dataIn, bs ) );
-        info->setClientId( tightUnmarshalString( dataIn, bs ) );
+            dynamic_cast<RemoveSubscriptionInfo*>(dataStructure);
+        info->setConnectionId(Pointer<ConnectionId>(dynamic_cast<ConnectionId* >(
+            tightUnmarshalCachedObject(wireFormat, dataIn, bs))));
+        info->setSubcriptionName(tightUnmarshalString(dataIn, bs));
+        info->setClientId(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 RemoveSubscriptionInfoMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) {
+int RemoveSubscriptionInfoMarshaller::tightMarshal1(OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs) {
 
     try {
 
         RemoveSubscriptionInfo* info =
-            dynamic_cast<RemoveSubscriptionInfo*>( dataStructure );
+            dynamic_cast<RemoveSubscriptionInfo*>(dataStructure);
 
-        int rc = BaseCommandMarshaller::tightMarshal1( wireFormat, dataStructure, bs );
-        rc += tightMarshalCachedObject1( wireFormat, info->getConnectionId().get(), bs );
-        rc += tightMarshalString1( info->getSubcriptionName(), bs );
-        rc += tightMarshalString1( info->getClientId(), bs );
+        int rc = BaseCommandMarshaller::tightMarshal1(wireFormat, dataStructure, bs);
+        rc += tightMarshalCachedObject1(wireFormat, info->getConnectionId().get(), bs);
+        rc += tightMarshalString1(info->getSubcriptionName(), bs);
+        rc += tightMarshalString1(info->getClientId(), 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 RemoveSubscriptionInfoMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) {
+void RemoveSubscriptionInfoMarshaller::tightMarshal2(OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs) {
 
     try {
 
-        BaseCommandMarshaller::tightMarshal2( wireFormat, dataStructure, dataOut, bs );
+        BaseCommandMarshaller::tightMarshal2(wireFormat, dataStructure, dataOut, bs );
 
         RemoveSubscriptionInfo* info =
-            dynamic_cast<RemoveSubscriptionInfo*>( dataStructure );
-        tightMarshalCachedObject2( wireFormat, info->getConnectionId().get(), dataOut, bs );
-        tightMarshalString2( info->getSubcriptionName(), dataOut, bs );
-        tightMarshalString2( info->getClientId(), dataOut, bs );
+            dynamic_cast<RemoveSubscriptionInfo*>(dataStructure);
+        tightMarshalCachedObject2(wireFormat, info->getConnectionId().get(), dataOut, bs);
+        tightMarshalString2(info->getSubcriptionName(), dataOut, bs);
+        tightMarshalString2(info->getClientId(), 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 RemoveSubscriptionInfoMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) {
+void RemoveSubscriptionInfoMarshaller::looseUnmarshal(OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn) {
 
     try {
 
-        BaseCommandMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
+        BaseCommandMarshaller::looseUnmarshal(wireFormat, dataStructure, dataIn);
         RemoveSubscriptionInfo* info =
-            dynamic_cast<RemoveSubscriptionInfo*>( dataStructure );
-        info->setConnectionId( Pointer<ConnectionId>( dynamic_cast< ConnectionId* >( 
-            looseUnmarshalCachedObject( wireFormat, dataIn ) ) ) );
-        info->setSubcriptionName( looseUnmarshalString( dataIn ) );
-        info->setClientId( looseUnmarshalString( dataIn ) );
+            dynamic_cast<RemoveSubscriptionInfo*>(dataStructure);
+        info->setConnectionId(Pointer<ConnectionId>(dynamic_cast<ConnectionId*>(
+            looseUnmarshalCachedObject(wireFormat, dataIn))));
+        info->setSubcriptionName(looseUnmarshalString(dataIn));
+        info->setClientId(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 RemoveSubscriptionInfoMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) {
+void RemoveSubscriptionInfoMarshaller::looseMarshal(OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut) {
 
     try {
 
         RemoveSubscriptionInfo* info =
-            dynamic_cast<RemoveSubscriptionInfo*>( dataStructure );
-        BaseCommandMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
-        looseMarshalCachedObject( wireFormat, info->getConnectionId().get(), dataOut );
-        looseMarshalString( info->getSubcriptionName(), dataOut );
-        looseMarshalString( info->getClientId(), dataOut );
+            dynamic_cast<RemoveSubscriptionInfo*>(dataStructure);
+        BaseCommandMarshaller::looseMarshal(wireFormat, dataStructure, dataOut);
+        looseMarshalCachedObject(wireFormat, info->getConnectionId().get(), dataOut);
+        looseMarshalString(info->getSubcriptionName(), dataOut);
+        looseMarshalString(info->getClientId(), 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/RemoveSubscriptionInfoMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/RemoveSubscriptionInfoMarshaller.h?rev=1460467&r1=1460466&r2=1460467&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/RemoveSubscriptionInfoMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/RemoveSubscriptionInfoMarshaller.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 RemoveSubscriptionInfoMarshaller
@@ -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/ReplayCommandMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ReplayCommandMarshaller.cpp?rev=1460467&r1=1460466&r2=1460467&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ReplayCommandMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ReplayCommandMarshaller.cpp Sun Mar 24 21:30:52 2013
@@ -51,82 +51,82 @@ unsigned char ReplayCommandMarshaller::g
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void ReplayCommandMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) {
+void ReplayCommandMarshaller::tightUnmarshal(OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs) {
 
     try {
 
-        BaseCommandMarshaller::tightUnmarshal( wireFormat, dataStructure, dataIn, bs );
+        BaseCommandMarshaller::tightUnmarshal(wireFormat, dataStructure, dataIn, bs);
 
         ReplayCommand* info =
-            dynamic_cast<ReplayCommand*>( dataStructure );
-        info->setFirstNakNumber( dataIn->readInt() );
-        info->setLastNakNumber( dataIn->readInt() );
+            dynamic_cast<ReplayCommand*>(dataStructure);
+        info->setFirstNakNumber(dataIn->readInt());
+        info->setLastNakNumber(dataIn->readInt());
     }
-    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 ReplayCommandMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) {
+int ReplayCommandMarshaller::tightMarshal1(OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs) {
 
     try {
 
-        int rc = BaseCommandMarshaller::tightMarshal1( wireFormat, dataStructure, bs );
+        int rc = BaseCommandMarshaller::tightMarshal1(wireFormat, dataStructure, bs);
 
         return rc + 8;
     }
-    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 ReplayCommandMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) {
+void ReplayCommandMarshaller::tightMarshal2(OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs) {
 
     try {
 
-        BaseCommandMarshaller::tightMarshal2( wireFormat, dataStructure, dataOut, bs );
+        BaseCommandMarshaller::tightMarshal2(wireFormat, dataStructure, dataOut, bs );
 
         ReplayCommand* info =
-            dynamic_cast<ReplayCommand*>( dataStructure );
-        dataOut->writeInt( info->getFirstNakNumber() );
-        dataOut->writeInt( info->getLastNakNumber() );
+            dynamic_cast<ReplayCommand*>(dataStructure);
+        dataOut->writeInt(info->getFirstNakNumber());
+        dataOut->writeInt(info->getLastNakNumber());
     }
-    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 ReplayCommandMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) {
+void ReplayCommandMarshaller::looseUnmarshal(OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn) {
 
     try {
 
-        BaseCommandMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
+        BaseCommandMarshaller::looseUnmarshal(wireFormat, dataStructure, dataIn);
         ReplayCommand* info =
-            dynamic_cast<ReplayCommand*>( dataStructure );
-        info->setFirstNakNumber( dataIn->readInt() );
-        info->setLastNakNumber( dataIn->readInt() );
+            dynamic_cast<ReplayCommand*>(dataStructure);
+        info->setFirstNakNumber(dataIn->readInt());
+        info->setLastNakNumber(dataIn->readInt());
     }
-    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 ReplayCommandMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) {
+void ReplayCommandMarshaller::looseMarshal(OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut) {
 
     try {
 
         ReplayCommand* info =
-            dynamic_cast<ReplayCommand*>( dataStructure );
-        BaseCommandMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
-        dataOut->writeInt( info->getFirstNakNumber() );
-        dataOut->writeInt( info->getLastNakNumber() );
+            dynamic_cast<ReplayCommand*>(dataStructure);
+        BaseCommandMarshaller::looseMarshal(wireFormat, dataStructure, dataOut);
+        dataOut->writeInt(info->getFirstNakNumber());
+        dataOut->writeInt(info->getLastNakNumber());
     }
-    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/ReplayCommandMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ReplayCommandMarshaller.h?rev=1460467&r1=1460466&r2=1460467&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ReplayCommandMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ReplayCommandMarshaller.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 ReplayCommandMarshaller
@@ -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/ResponseMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ResponseMarshaller.cpp?rev=1460467&r1=1460466&r2=1460467&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ResponseMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ResponseMarshaller.cpp Sun Mar 24 21:30:52 2013
@@ -51,78 +51,78 @@ unsigned char ResponseMarshaller::getDat
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void ResponseMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) {
+void ResponseMarshaller::tightUnmarshal(OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs) {
 
     try {
 
-        BaseCommandMarshaller::tightUnmarshal( wireFormat, dataStructure, dataIn, bs );
+        BaseCommandMarshaller::tightUnmarshal(wireFormat, dataStructure, dataIn, bs);
 
         Response* info =
-            dynamic_cast<Response*>( dataStructure );
-        info->setCorrelationId( dataIn->readInt() );
+            dynamic_cast<Response*>(dataStructure);
+        info->setCorrelationId(dataIn->readInt());
     }
-    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 ResponseMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) {
+int ResponseMarshaller::tightMarshal1(OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs) {
 
     try {
 
-        int rc = BaseCommandMarshaller::tightMarshal1( wireFormat, dataStructure, bs );
+        int rc = BaseCommandMarshaller::tightMarshal1(wireFormat, dataStructure, bs);
 
         return rc + 4;
     }
-    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 ResponseMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) {
+void ResponseMarshaller::tightMarshal2(OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs) {
 
     try {
 
-        BaseCommandMarshaller::tightMarshal2( wireFormat, dataStructure, dataOut, bs );
+        BaseCommandMarshaller::tightMarshal2(wireFormat, dataStructure, dataOut, bs );
 
         Response* info =
-            dynamic_cast<Response*>( dataStructure );
-        dataOut->writeInt( info->getCorrelationId() );
+            dynamic_cast<Response*>(dataStructure);
+        dataOut->writeInt(info->getCorrelationId());
     }
-    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 ResponseMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) {
+void ResponseMarshaller::looseUnmarshal(OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn) {
 
     try {
 
-        BaseCommandMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
+        BaseCommandMarshaller::looseUnmarshal(wireFormat, dataStructure, dataIn);
         Response* info =
-            dynamic_cast<Response*>( dataStructure );
-        info->setCorrelationId( dataIn->readInt() );
+            dynamic_cast<Response*>(dataStructure);
+        info->setCorrelationId(dataIn->readInt());
     }
-    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 ResponseMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) {
+void ResponseMarshaller::looseMarshal(OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut) {
 
     try {
 
         Response* info =
-            dynamic_cast<Response*>( dataStructure );
-        BaseCommandMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
-        dataOut->writeInt( info->getCorrelationId() );
+            dynamic_cast<Response*>(dataStructure);
+        BaseCommandMarshaller::looseMarshal(wireFormat, dataStructure, dataOut);
+        dataOut->writeInt(info->getCorrelationId());
     }
-    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/ResponseMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ResponseMarshaller.h?rev=1460467&r1=1460466&r2=1460467&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ResponseMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ResponseMarshaller.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 ResponseMarshaller
@@ -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/SessionIdMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/SessionIdMarshaller.cpp?rev=1460467&r1=1460466&r2=1460467&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/SessionIdMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/SessionIdMarshaller.cpp Sun Mar 24 21:30:52 2013
@@ -51,87 +51,87 @@ unsigned char SessionIdMarshaller::getDa
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void SessionIdMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) {
+void SessionIdMarshaller::tightUnmarshal(OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs) {
 
     try {
 
-        BaseDataStreamMarshaller::tightUnmarshal( wireFormat, dataStructure, dataIn, bs );
+        BaseDataStreamMarshaller::tightUnmarshal(wireFormat, dataStructure, dataIn, bs);
 
         SessionId* info =
-            dynamic_cast<SessionId*>( dataStructure );
-        info->setConnectionId( tightUnmarshalString( dataIn, bs ) );
-        info->setValue( tightUnmarshalLong( wireFormat, dataIn, bs ) );
+            dynamic_cast<SessionId*>(dataStructure);
+        info->setConnectionId(tightUnmarshalString(dataIn, bs));
+        info->setValue(tightUnmarshalLong(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 SessionIdMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) {
+int SessionIdMarshaller::tightMarshal1(OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs) {
 
     try {
 
         SessionId* info =
-            dynamic_cast<SessionId*>( dataStructure );
+            dynamic_cast<SessionId*>(dataStructure);
 
-        int rc = BaseDataStreamMarshaller::tightMarshal1( wireFormat, dataStructure, bs );
-        rc += tightMarshalString1( info->getConnectionId(), bs );
-        rc += tightMarshalLong1( wireFormat, info->getValue(), bs );
+        int rc = BaseDataStreamMarshaller::tightMarshal1(wireFormat, dataStructure, bs);
+        rc += tightMarshalString1(info->getConnectionId(), bs);
+        rc += tightMarshalLong1(wireFormat, info->getValue(), 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 SessionIdMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) {
+void SessionIdMarshaller::tightMarshal2(OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs) {
 
     try {
 
-        BaseDataStreamMarshaller::tightMarshal2( wireFormat, dataStructure, dataOut, bs );
+        BaseDataStreamMarshaller::tightMarshal2(wireFormat, dataStructure, dataOut, bs );
 
         SessionId* info =
-            dynamic_cast<SessionId*>( dataStructure );
-        tightMarshalString2( info->getConnectionId(), dataOut, bs );
-        tightMarshalLong2( wireFormat, info->getValue(), dataOut, bs );
+            dynamic_cast<SessionId*>(dataStructure);
+        tightMarshalString2(info->getConnectionId(), dataOut, bs);
+        tightMarshalLong2(wireFormat, info->getValue(), 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 SessionIdMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) {
+void SessionIdMarshaller::looseUnmarshal(OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn) {
 
     try {
 
-        BaseDataStreamMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
+        BaseDataStreamMarshaller::looseUnmarshal(wireFormat, dataStructure, dataIn);
         SessionId* info =
-            dynamic_cast<SessionId*>( dataStructure );
-        info->setConnectionId( looseUnmarshalString( dataIn ) );
-        info->setValue( looseUnmarshalLong( wireFormat, dataIn ) );
+            dynamic_cast<SessionId*>(dataStructure);
+        info->setConnectionId(looseUnmarshalString(dataIn));
+        info->setValue(looseUnmarshalLong(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 SessionIdMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) {
+void SessionIdMarshaller::looseMarshal(OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut) {
 
     try {
 
         SessionId* info =
-            dynamic_cast<SessionId*>( dataStructure );
-        BaseDataStreamMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
-        looseMarshalString( info->getConnectionId(), dataOut );
-        looseMarshalLong( wireFormat, info->getValue(), dataOut );
+            dynamic_cast<SessionId*>(dataStructure);
+        BaseDataStreamMarshaller::looseMarshal(wireFormat, dataStructure, dataOut);
+        looseMarshalString(info->getConnectionId(), dataOut);
+        looseMarshalLong(wireFormat, info->getValue(), 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/SessionIdMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/SessionIdMarshaller.h?rev=1460467&r1=1460466&r2=1460467&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/SessionIdMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/SessionIdMarshaller.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 SessionIdMarshaller
@@ -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