activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r1460467 [15/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/SessionInfoMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/SessionInfoMarshaller.cpp?rev=1460467&r1=1460466&r2=1460467&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/SessionInfoMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/SessionInfoMarshaller.cpp Sun Mar 24 21:30:52 2013
@@ -51,84 +51,84 @@ unsigned char SessionInfoMarshaller::get
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void SessionInfoMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) {
+void SessionInfoMarshaller::tightUnmarshal(OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs) {
 
     try {
 
-        BaseCommandMarshaller::tightUnmarshal( wireFormat, dataStructure, dataIn, bs );
+        BaseCommandMarshaller::tightUnmarshal(wireFormat, dataStructure, dataIn, bs);
 
         SessionInfo* info =
-            dynamic_cast<SessionInfo*>( dataStructure );
-        info->setSessionId( Pointer<SessionId>( dynamic_cast< SessionId* >(
-            tightUnmarshalCachedObject( wireFormat, dataIn, bs ) ) ) );
+            dynamic_cast<SessionInfo*>(dataStructure);
+        info->setSessionId(Pointer<SessionId>(dynamic_cast<SessionId* >(
+            tightUnmarshalCachedObject(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 SessionInfoMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) {
+int SessionInfoMarshaller::tightMarshal1(OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs) {
 
     try {
 
         SessionInfo* info =
-            dynamic_cast<SessionInfo*>( dataStructure );
+            dynamic_cast<SessionInfo*>(dataStructure);
 
-        int rc = BaseCommandMarshaller::tightMarshal1( wireFormat, dataStructure, bs );
-        rc += tightMarshalCachedObject1( wireFormat, info->getSessionId().get(), bs );
+        int rc = BaseCommandMarshaller::tightMarshal1(wireFormat, dataStructure, bs);
+        rc += tightMarshalCachedObject1(wireFormat, info->getSessionId().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 SessionInfoMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) {
+void SessionInfoMarshaller::tightMarshal2(OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs) {
 
     try {
 
-        BaseCommandMarshaller::tightMarshal2( wireFormat, dataStructure, dataOut, bs );
+        BaseCommandMarshaller::tightMarshal2(wireFormat, dataStructure, dataOut, bs );
 
         SessionInfo* info =
-            dynamic_cast<SessionInfo*>( dataStructure );
-        tightMarshalCachedObject2( wireFormat, info->getSessionId().get(), dataOut, bs );
+            dynamic_cast<SessionInfo*>(dataStructure);
+        tightMarshalCachedObject2(wireFormat, info->getSessionId().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 SessionInfoMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) {
+void SessionInfoMarshaller::looseUnmarshal(OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn) {
 
     try {
 
-        BaseCommandMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
+        BaseCommandMarshaller::looseUnmarshal(wireFormat, dataStructure, dataIn);
         SessionInfo* info =
-            dynamic_cast<SessionInfo*>( dataStructure );
-        info->setSessionId( Pointer<SessionId>( dynamic_cast< SessionId* >( 
-            looseUnmarshalCachedObject( wireFormat, dataIn ) ) ) );
+            dynamic_cast<SessionInfo*>(dataStructure);
+        info->setSessionId(Pointer<SessionId>(dynamic_cast<SessionId*>(
+            looseUnmarshalCachedObject(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 SessionInfoMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) {
+void SessionInfoMarshaller::looseMarshal(OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut) {
 
     try {
 
         SessionInfo* info =
-            dynamic_cast<SessionInfo*>( dataStructure );
-        BaseCommandMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
-        looseMarshalCachedObject( wireFormat, info->getSessionId().get(), dataOut );
+            dynamic_cast<SessionInfo*>(dataStructure);
+        BaseCommandMarshaller::looseMarshal(wireFormat, dataStructure, dataOut);
+        looseMarshalCachedObject(wireFormat, info->getSessionId().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/SessionInfoMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/SessionInfoMarshaller.h?rev=1460467&r1=1460466&r2=1460467&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/SessionInfoMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/SessionInfoMarshaller.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 SessionInfoMarshaller
@@ -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/ShutdownInfoMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ShutdownInfoMarshaller.cpp?rev=1460467&r1=1460466&r2=1460467&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ShutdownInfoMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ShutdownInfoMarshaller.cpp Sun Mar 24 21:30:52 2013
@@ -51,66 +51,66 @@ unsigned char ShutdownInfoMarshaller::ge
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void ShutdownInfoMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) {
+void ShutdownInfoMarshaller::tightUnmarshal(OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs) {
 
     try {
 
-        BaseCommandMarshaller::tightUnmarshal( wireFormat, dataStructure, dataIn, bs );
+        BaseCommandMarshaller::tightUnmarshal(wireFormat, dataStructure, 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 ShutdownInfoMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) {
+int ShutdownInfoMarshaller::tightMarshal1(OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs) {
 
     try {
 
-        int rc = BaseCommandMarshaller::tightMarshal1( wireFormat, dataStructure, bs );
+        int rc = BaseCommandMarshaller::tightMarshal1(wireFormat, dataStructure, 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 ShutdownInfoMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) {
+void ShutdownInfoMarshaller::tightMarshal2(OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs) {
 
     try {
 
-        BaseCommandMarshaller::tightMarshal2( wireFormat, dataStructure, dataOut, bs );
+        BaseCommandMarshaller::tightMarshal2(wireFormat, dataStructure, 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 ShutdownInfoMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) {
+void ShutdownInfoMarshaller::looseUnmarshal(OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn) {
 
     try {
 
-        BaseCommandMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
+        BaseCommandMarshaller::looseUnmarshal(wireFormat, dataStructure, 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 ShutdownInfoMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) {
+void ShutdownInfoMarshaller::looseMarshal(OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut) {
 
     try {
 
-        BaseCommandMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
+        BaseCommandMarshaller::looseMarshal(wireFormat, dataStructure, 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/ShutdownInfoMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ShutdownInfoMarshaller.h?rev=1460467&r1=1460466&r2=1460467&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ShutdownInfoMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ShutdownInfoMarshaller.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 ShutdownInfoMarshaller
@@ -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/SubscriptionInfoMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/SubscriptionInfoMarshaller.cpp?rev=1460467&r1=1460466&r2=1460467&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/SubscriptionInfoMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/SubscriptionInfoMarshaller.cpp Sun Mar 24 21:30:52 2013
@@ -51,131 +51,131 @@ unsigned char SubscriptionInfoMarshaller
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void SubscriptionInfoMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) {
+void SubscriptionInfoMarshaller::tightUnmarshal(OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs) {
 
     try {
 
-        BaseDataStreamMarshaller::tightUnmarshal( wireFormat, dataStructure, dataIn, bs );
+        BaseDataStreamMarshaller::tightUnmarshal(wireFormat, dataStructure, dataIn, bs);
 
         SubscriptionInfo* info =
-            dynamic_cast<SubscriptionInfo*>( dataStructure );
+            dynamic_cast<SubscriptionInfo*>(dataStructure);
 
         int wireVersion = wireFormat->getVersion();
 
-        info->setClientId( tightUnmarshalString( dataIn, bs ) );
-        info->setDestination( Pointer<ActiveMQDestination>( dynamic_cast< ActiveMQDestination* >(
-            tightUnmarshalCachedObject( wireFormat, dataIn, bs ) ) ) );
-        info->setSelector( tightUnmarshalString( dataIn, bs ) );
-        info->setSubcriptionName( tightUnmarshalString( dataIn, bs ) );
-        if( wireVersion >= 3 ) {
-            info->setSubscribedDestination( Pointer<ActiveMQDestination>( dynamic_cast< ActiveMQDestination* >(
-                tightUnmarshalNestedObject( wireFormat, dataIn, bs ) ) ) );
+        info->setClientId(tightUnmarshalString(dataIn, bs));
+        info->setDestination(Pointer<ActiveMQDestination>(dynamic_cast<ActiveMQDestination* >(
+            tightUnmarshalCachedObject(wireFormat, dataIn, bs))));
+        info->setSelector(tightUnmarshalString(dataIn, bs));
+        info->setSubcriptionName(tightUnmarshalString(dataIn, bs));
+        if (wireVersion >= 3) {
+            info->setSubscribedDestination(Pointer<ActiveMQDestination>(dynamic_cast<ActiveMQDestination* >(
+                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 SubscriptionInfoMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) {
+int SubscriptionInfoMarshaller::tightMarshal1(OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs) {
 
     try {
 
         SubscriptionInfo* info =
-            dynamic_cast<SubscriptionInfo*>( dataStructure );
+            dynamic_cast<SubscriptionInfo*>(dataStructure);
 
-        int rc = BaseDataStreamMarshaller::tightMarshal1( wireFormat, dataStructure, bs );
+        int rc = BaseDataStreamMarshaller::tightMarshal1(wireFormat, dataStructure, bs);
 
         int wireVersion = wireFormat->getVersion();
 
-        rc += tightMarshalString1( info->getClientId(), bs );
-        rc += tightMarshalCachedObject1( wireFormat, info->getDestination().get(), bs );
-        rc += tightMarshalString1( info->getSelector(), bs );
-        rc += tightMarshalString1( info->getSubcriptionName(), bs );
-        if( wireVersion >= 3 ) {
-            rc += tightMarshalNestedObject1( wireFormat, info->getSubscribedDestination().get(), bs );
+        rc += tightMarshalString1(info->getClientId(), bs);
+        rc += tightMarshalCachedObject1(wireFormat, info->getDestination().get(), bs);
+        rc += tightMarshalString1(info->getSelector(), bs);
+        rc += tightMarshalString1(info->getSubcriptionName(), bs);
+        if (wireVersion >= 3) {
+            rc += tightMarshalNestedObject1(wireFormat, info->getSubscribedDestination().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 SubscriptionInfoMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) {
+void SubscriptionInfoMarshaller::tightMarshal2(OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs) {
 
     try {
 
-        BaseDataStreamMarshaller::tightMarshal2( wireFormat, dataStructure, dataOut, bs );
+        BaseDataStreamMarshaller::tightMarshal2(wireFormat, dataStructure, dataOut, bs );
 
         SubscriptionInfo* info =
-            dynamic_cast<SubscriptionInfo*>( dataStructure );
+            dynamic_cast<SubscriptionInfo*>(dataStructure);
 
         int wireVersion = wireFormat->getVersion();
 
-        tightMarshalString2( info->getClientId(), dataOut, bs );
-        tightMarshalCachedObject2( wireFormat, info->getDestination().get(), dataOut, bs );
-        tightMarshalString2( info->getSelector(), dataOut, bs );
-        tightMarshalString2( info->getSubcriptionName(), dataOut, bs );
-        if( wireVersion >= 3 ) {
-            tightMarshalNestedObject2( wireFormat, info->getSubscribedDestination().get(), dataOut, bs );
+        tightMarshalString2(info->getClientId(), dataOut, bs);
+        tightMarshalCachedObject2(wireFormat, info->getDestination().get(), dataOut, bs);
+        tightMarshalString2(info->getSelector(), dataOut, bs);
+        tightMarshalString2(info->getSubcriptionName(), dataOut, bs);
+        if (wireVersion >= 3) {
+            tightMarshalNestedObject2(wireFormat, info->getSubscribedDestination().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 SubscriptionInfoMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) {
+void SubscriptionInfoMarshaller::looseUnmarshal(OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn) {
 
     try {
 
-        BaseDataStreamMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
+        BaseDataStreamMarshaller::looseUnmarshal(wireFormat, dataStructure, dataIn);
         SubscriptionInfo* info =
-            dynamic_cast<SubscriptionInfo*>( dataStructure );
+            dynamic_cast<SubscriptionInfo*>(dataStructure);
 
         int wireVersion = wireFormat->getVersion();
 
-        info->setClientId( looseUnmarshalString( dataIn ) );
-        info->setDestination( Pointer<ActiveMQDestination>( dynamic_cast< ActiveMQDestination* >( 
-            looseUnmarshalCachedObject( wireFormat, dataIn ) ) ) );
-        info->setSelector( looseUnmarshalString( dataIn ) );
-        info->setSubcriptionName( looseUnmarshalString( dataIn ) );
-        if( wireVersion >= 3 ) {
-            info->setSubscribedDestination( Pointer<ActiveMQDestination>( dynamic_cast< ActiveMQDestination* >( 
-                looseUnmarshalNestedObject( wireFormat, dataIn ) ) ) );
+        info->setClientId(looseUnmarshalString(dataIn));
+        info->setDestination(Pointer<ActiveMQDestination>(dynamic_cast<ActiveMQDestination*>(
+            looseUnmarshalCachedObject(wireFormat, dataIn))));
+        info->setSelector(looseUnmarshalString(dataIn));
+        info->setSubcriptionName(looseUnmarshalString(dataIn));
+        if (wireVersion >= 3) {
+            info->setSubscribedDestination(Pointer<ActiveMQDestination>(dynamic_cast<ActiveMQDestination*>(
+                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 SubscriptionInfoMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) {
+void SubscriptionInfoMarshaller::looseMarshal(OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut) {
 
     try {
 
         SubscriptionInfo* info =
-            dynamic_cast<SubscriptionInfo*>( dataStructure );
-        BaseDataStreamMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
+            dynamic_cast<SubscriptionInfo*>(dataStructure);
+        BaseDataStreamMarshaller::looseMarshal(wireFormat, dataStructure, dataOut);
 
         int wireVersion = wireFormat->getVersion();
 
-        looseMarshalString( info->getClientId(), dataOut );
-        looseMarshalCachedObject( wireFormat, info->getDestination().get(), dataOut );
-        looseMarshalString( info->getSelector(), dataOut );
-        looseMarshalString( info->getSubcriptionName(), dataOut );
-        if( wireVersion >= 3 ) {
-            looseMarshalNestedObject( wireFormat, info->getSubscribedDestination().get(), dataOut );
+        looseMarshalString(info->getClientId(), dataOut);
+        looseMarshalCachedObject(wireFormat, info->getDestination().get(), dataOut);
+        looseMarshalString(info->getSelector(), dataOut);
+        looseMarshalString(info->getSubcriptionName(), dataOut);
+        if (wireVersion >= 3) {
+            looseMarshalNestedObject(wireFormat, info->getSubscribedDestination().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/SubscriptionInfoMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/SubscriptionInfoMarshaller.h?rev=1460467&r1=1460466&r2=1460467&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/SubscriptionInfoMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/SubscriptionInfoMarshaller.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 SubscriptionInfoMarshaller
@@ -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/TransactionIdMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/TransactionIdMarshaller.cpp?rev=1460467&r1=1460466&r2=1460467&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/TransactionIdMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/TransactionIdMarshaller.cpp Sun Mar 24 21:30:52 2013
@@ -41,66 +41,66 @@ using namespace decaf::io;
 using namespace decaf::lang;
 
 ///////////////////////////////////////////////////////////////////////////////
-void TransactionIdMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) {
+void TransactionIdMarshaller::tightUnmarshal(OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs) {
 
     try {
 
-        BaseDataStreamMarshaller::tightUnmarshal( wireFormat, dataStructure, dataIn, bs );
+        BaseDataStreamMarshaller::tightUnmarshal(wireFormat, dataStructure, 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 TransactionIdMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) {
+int TransactionIdMarshaller::tightMarshal1(OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs) {
 
     try {
 
-        int rc = BaseDataStreamMarshaller::tightMarshal1( wireFormat, dataStructure, bs );
+        int rc = BaseDataStreamMarshaller::tightMarshal1(wireFormat, dataStructure, 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 TransactionIdMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) {
+void TransactionIdMarshaller::tightMarshal2(OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs) {
 
     try {
 
-        BaseDataStreamMarshaller::tightMarshal2( wireFormat, dataStructure, dataOut, bs );
+        BaseDataStreamMarshaller::tightMarshal2(wireFormat, dataStructure, 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 TransactionIdMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) {
+void TransactionIdMarshaller::looseUnmarshal(OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn) {
 
     try {
 
-        BaseDataStreamMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
+        BaseDataStreamMarshaller::looseUnmarshal(wireFormat, dataStructure, 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 TransactionIdMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) {
+void TransactionIdMarshaller::looseMarshal(OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut) {
 
     try {
 
-        BaseDataStreamMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
+        BaseDataStreamMarshaller::looseMarshal(wireFormat, dataStructure, 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/TransactionIdMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/TransactionIdMarshaller.h?rev=1460467&r1=1460466&r2=1460467&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/TransactionIdMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/TransactionIdMarshaller.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 TransactionIdMarshaller
@@ -52,27 +52,27 @@ namespace generated{
         TransactionIdMarshaller() {}
         virtual ~TransactionIdMarshaller() {}
 
-        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/TransactionInfoMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/TransactionInfoMarshaller.cpp?rev=1460467&r1=1460466&r2=1460467&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/TransactionInfoMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/TransactionInfoMarshaller.cpp Sun Mar 24 21:30:52 2013
@@ -51,95 +51,95 @@ unsigned char TransactionInfoMarshaller:
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void TransactionInfoMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) {
+void TransactionInfoMarshaller::tightUnmarshal(OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs) {
 
     try {
 
-        BaseCommandMarshaller::tightUnmarshal( wireFormat, dataStructure, dataIn, bs );
+        BaseCommandMarshaller::tightUnmarshal(wireFormat, dataStructure, dataIn, bs);
 
         TransactionInfo* info =
-            dynamic_cast<TransactionInfo*>( dataStructure );
-        info->setConnectionId( Pointer<ConnectionId>( dynamic_cast< ConnectionId* >(
-            tightUnmarshalCachedObject( wireFormat, dataIn, bs ) ) ) );
-        info->setTransactionId( Pointer<TransactionId>( dynamic_cast< TransactionId* >(
-            tightUnmarshalCachedObject( wireFormat, dataIn, bs ) ) ) );
-        info->setType( dataIn->readByte() );
+            dynamic_cast<TransactionInfo*>(dataStructure);
+        info->setConnectionId(Pointer<ConnectionId>(dynamic_cast<ConnectionId* >(
+            tightUnmarshalCachedObject(wireFormat, dataIn, bs))));
+        info->setTransactionId(Pointer<TransactionId>(dynamic_cast<TransactionId* >(
+            tightUnmarshalCachedObject(wireFormat, dataIn, bs))));
+        info->setType(dataIn->readByte());
     }
-    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 TransactionInfoMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) {
+int TransactionInfoMarshaller::tightMarshal1(OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs) {
 
     try {
 
         TransactionInfo* info =
-            dynamic_cast<TransactionInfo*>( dataStructure );
+            dynamic_cast<TransactionInfo*>(dataStructure);
 
-        int rc = BaseCommandMarshaller::tightMarshal1( wireFormat, dataStructure, bs );
-        rc += tightMarshalCachedObject1( wireFormat, info->getConnectionId().get(), bs );
-        rc += tightMarshalCachedObject1( wireFormat, info->getTransactionId().get(), bs );
+        int rc = BaseCommandMarshaller::tightMarshal1(wireFormat, dataStructure, bs);
+        rc += tightMarshalCachedObject1(wireFormat, info->getConnectionId().get(), bs);
+        rc += tightMarshalCachedObject1(wireFormat, info->getTransactionId().get(), 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 TransactionInfoMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) {
+void TransactionInfoMarshaller::tightMarshal2(OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs) {
 
     try {
 
-        BaseCommandMarshaller::tightMarshal2( wireFormat, dataStructure, dataOut, bs );
+        BaseCommandMarshaller::tightMarshal2(wireFormat, dataStructure, dataOut, bs );
 
         TransactionInfo* info =
-            dynamic_cast<TransactionInfo*>( dataStructure );
-        tightMarshalCachedObject2( wireFormat, info->getConnectionId().get(), dataOut, bs );
-        tightMarshalCachedObject2( wireFormat, info->getTransactionId().get(), dataOut, bs );
-        dataOut->write( info->getType() );
+            dynamic_cast<TransactionInfo*>(dataStructure);
+        tightMarshalCachedObject2(wireFormat, info->getConnectionId().get(), dataOut, bs);
+        tightMarshalCachedObject2(wireFormat, info->getTransactionId().get(), dataOut, bs);
+        dataOut->write(info->getType());
     }
-    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 TransactionInfoMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) {
+void TransactionInfoMarshaller::looseUnmarshal(OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn) {
 
     try {
 
-        BaseCommandMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
+        BaseCommandMarshaller::looseUnmarshal(wireFormat, dataStructure, dataIn);
         TransactionInfo* info =
-            dynamic_cast<TransactionInfo*>( dataStructure );
-        info->setConnectionId( Pointer<ConnectionId>( dynamic_cast< ConnectionId* >( 
-            looseUnmarshalCachedObject( wireFormat, dataIn ) ) ) );
-        info->setTransactionId( Pointer<TransactionId>( dynamic_cast< TransactionId* >( 
-            looseUnmarshalCachedObject( wireFormat, dataIn ) ) ) );
-        info->setType( dataIn->readByte() );
+            dynamic_cast<TransactionInfo*>(dataStructure);
+        info->setConnectionId(Pointer<ConnectionId>(dynamic_cast<ConnectionId*>(
+            looseUnmarshalCachedObject(wireFormat, dataIn))));
+        info->setTransactionId(Pointer<TransactionId>(dynamic_cast<TransactionId*>(
+            looseUnmarshalCachedObject(wireFormat, dataIn))));
+        info->setType(dataIn->readByte());
     }
-    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 TransactionInfoMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) {
+void TransactionInfoMarshaller::looseMarshal(OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut) {
 
     try {
 
         TransactionInfo* info =
-            dynamic_cast<TransactionInfo*>( dataStructure );
-        BaseCommandMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
-        looseMarshalCachedObject( wireFormat, info->getConnectionId().get(), dataOut );
-        looseMarshalCachedObject( wireFormat, info->getTransactionId().get(), dataOut );
-        dataOut->write( info->getType() );
+            dynamic_cast<TransactionInfo*>(dataStructure);
+        BaseCommandMarshaller::looseMarshal(wireFormat, dataStructure, dataOut);
+        looseMarshalCachedObject(wireFormat, info->getConnectionId().get(), dataOut);
+        looseMarshalCachedObject(wireFormat, info->getTransactionId().get(), dataOut);
+        dataOut->write(info->getType());
     }
-    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/TransactionInfoMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/TransactionInfoMarshaller.h?rev=1460467&r1=1460466&r2=1460467&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/TransactionInfoMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/TransactionInfoMarshaller.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 TransactionInfoMarshaller
@@ -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/WireFormatInfoMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/WireFormatInfoMarshaller.cpp?rev=1460467&r1=1460466&r2=1460467&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/WireFormatInfoMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/WireFormatInfoMarshaller.cpp Sun Mar 24 21:30:52 2013
@@ -51,108 +51,108 @@ unsigned char WireFormatInfoMarshaller::
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void WireFormatInfoMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) {
+void WireFormatInfoMarshaller::tightUnmarshal(OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs) {
 
     try {
 
-        BaseDataStreamMarshaller::tightUnmarshal( wireFormat, dataStructure, dataIn, bs );
+        BaseDataStreamMarshaller::tightUnmarshal(wireFormat, dataStructure, dataIn, bs);
 
         WireFormatInfo* info =
-            dynamic_cast<WireFormatInfo*>( dataStructure );
-        info->beforeUnmarshal( wireFormat );
+            dynamic_cast<WireFormatInfo*>(dataStructure);
+        info->beforeUnmarshal(wireFormat);
 
-        info->setMagic( tightUnmarshalConstByteArray( dataIn, bs, 8 ) );
-        info->setVersion( dataIn->readInt() );
-        info->setMarshalledProperties( tightUnmarshalByteArray( dataIn, bs ) );
+        info->setMagic(tightUnmarshalConstByteArray(dataIn, bs, 8));
+        info->setVersion(dataIn->readInt());
+        info->setMarshalledProperties(tightUnmarshalByteArray(dataIn, bs));
 
         info->afterUnmarshal( wireFormat );
     }
-    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 WireFormatInfoMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) {
+int WireFormatInfoMarshaller::tightMarshal1(OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs) {
 
     try {
 
         WireFormatInfo* info =
-            dynamic_cast<WireFormatInfo*>( dataStructure );
+            dynamic_cast<WireFormatInfo*>(dataStructure);
 
-        info->beforeMarshal( wireFormat );
-        int rc = BaseDataStreamMarshaller::tightMarshal1( wireFormat, dataStructure, bs );
-        bs->writeBoolean( info->getMarshalledProperties().size() != 0 );
+        info->beforeMarshal(wireFormat);
+        int rc = BaseDataStreamMarshaller::tightMarshal1(wireFormat, dataStructure, bs);
+        bs->writeBoolean(info->getMarshalledProperties().size() != 0);
         rc += info->getMarshalledProperties().size() == 0 ? 0 : (int)info->getMarshalledProperties().size() + 4;
 
         return rc + 12;
     }
-    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 WireFormatInfoMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) {
+void WireFormatInfoMarshaller::tightMarshal2(OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs) {
 
     try {
 
-        BaseDataStreamMarshaller::tightMarshal2( wireFormat, dataStructure, dataOut, bs );
+        BaseDataStreamMarshaller::tightMarshal2(wireFormat, dataStructure, dataOut, bs );
 
         WireFormatInfo* info =
-            dynamic_cast<WireFormatInfo*>( dataStructure );
-        dataOut->write( (const unsigned char*)(&info->getMagic()[0]), 8, 0, 8 );
-        dataOut->writeInt( info->getVersion() );
-        if( bs->readBoolean() ) {
-            dataOut->writeInt( (int)info->getMarshalledProperties().size() );
-            dataOut->write( (const unsigned char*)(&info->getMarshalledProperties()[0]), (int)info->getMarshalledProperties().size(), 0, (int)info->getMarshalledProperties().size() );
+            dynamic_cast<WireFormatInfo*>(dataStructure);
+        dataOut->write((const unsigned char*)(&info->getMagic()[0]), 8, 0, 8);
+        dataOut->writeInt(info->getVersion());
+        if (bs->readBoolean()) {
+            dataOut->writeInt((int)info->getMarshalledProperties().size() );
+            dataOut->write((const unsigned char*)(&info->getMarshalledProperties()[0]), (int)info->getMarshalledProperties().size(), 0, (int)info->getMarshalledProperties().size());
         }
-        info->afterMarshal( wireFormat );
+        info->afterMarshal(wireFormat);
     }
-    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 WireFormatInfoMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) {
+void WireFormatInfoMarshaller::looseUnmarshal(OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn) {
 
     try {
 
-        BaseDataStreamMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
+        BaseDataStreamMarshaller::looseUnmarshal(wireFormat, dataStructure, dataIn);
         WireFormatInfo* info =
-            dynamic_cast<WireFormatInfo*>( dataStructure );
-        info->beforeUnmarshal( wireFormat );
-        info->setMagic( looseUnmarshalConstByteArray( dataIn, 8 ) );
-        info->setVersion( dataIn->readInt() );
-        info->setMarshalledProperties( looseUnmarshalByteArray( dataIn ) );
-        info->afterUnmarshal( wireFormat );
+            dynamic_cast<WireFormatInfo*>(dataStructure);
+        info->beforeUnmarshal(wireFormat);
+        info->setMagic(looseUnmarshalConstByteArray(dataIn, 8));
+        info->setVersion(dataIn->readInt());
+        info->setMarshalledProperties(looseUnmarshalByteArray(dataIn));
+        info->afterUnmarshal(wireFormat);
     }
-    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 WireFormatInfoMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) {
+void WireFormatInfoMarshaller::looseMarshal(OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut) {
 
     try {
 
         WireFormatInfo* info =
-            dynamic_cast<WireFormatInfo*>( dataStructure );
-        info->beforeMarshal( wireFormat );
-        BaseDataStreamMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
-        dataOut->write( (const unsigned char*)(&info->getMagic()[0]), 8, 0, 8 );
-        dataOut->writeInt( info->getVersion() );
+            dynamic_cast<WireFormatInfo*>(dataStructure);
+        info->beforeMarshal(wireFormat);
+        BaseDataStreamMarshaller::looseMarshal(wireFormat, dataStructure, dataOut);
+        dataOut->write((const unsigned char*)(&info->getMagic()[0]), 8, 0, 8);
+        dataOut->writeInt(info->getVersion());
         dataOut->write( info->getMarshalledProperties().size() != 0 );
         if( info->getMarshalledProperties().size() != 0 ) {
             dataOut->writeInt( (int)info->getMarshalledProperties().size() );
-            dataOut->write( (const unsigned char*)(&info->getMarshalledProperties()[0]), (int)info->getMarshalledProperties().size(), 0, (int)info->getMarshalledProperties().size() );
+            dataOut->write((const unsigned char*)(&info->getMarshalledProperties()[0]), (int)info->getMarshalledProperties().size(), 0, (int)info->getMarshalledProperties().size());
         }
-        info->afterMarshal( wireFormat );
+        info->afterMarshal(wireFormat);
     }
-    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/WireFormatInfoMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/WireFormatInfoMarshaller.h?rev=1460467&r1=1460466&r2=1460467&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/WireFormatInfoMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/WireFormatInfoMarshaller.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 WireFormatInfoMarshaller
@@ -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/XATransactionIdMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/XATransactionIdMarshaller.cpp?rev=1460467&r1=1460466&r2=1460467&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/XATransactionIdMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/XATransactionIdMarshaller.cpp Sun Mar 24 21:30:52 2013
@@ -51,107 +51,107 @@ unsigned char XATransactionIdMarshaller:
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void XATransactionIdMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) {
+void XATransactionIdMarshaller::tightUnmarshal(OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs) {
 
     try {
 
-        TransactionIdMarshaller::tightUnmarshal( wireFormat, dataStructure, dataIn, bs );
+        TransactionIdMarshaller::tightUnmarshal(wireFormat, dataStructure, dataIn, bs);
 
         XATransactionId* info =
-            dynamic_cast<XATransactionId*>( dataStructure );
-        info->setFormatId( dataIn->readInt() );
-        info->setGlobalTransactionId( tightUnmarshalByteArray( dataIn, bs ) );
-        info->setBranchQualifier( tightUnmarshalByteArray( dataIn, bs ) );
+            dynamic_cast<XATransactionId*>(dataStructure);
+        info->setFormatId(dataIn->readInt());
+        info->setGlobalTransactionId(tightUnmarshalByteArray(dataIn, bs));
+        info->setBranchQualifier(tightUnmarshalByteArray(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 XATransactionIdMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) {
+int XATransactionIdMarshaller::tightMarshal1(OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs) {
 
     try {
 
         XATransactionId* info =
-            dynamic_cast<XATransactionId*>( dataStructure );
+            dynamic_cast<XATransactionId*>(dataStructure);
 
-        int rc = TransactionIdMarshaller::tightMarshal1( wireFormat, dataStructure, bs );
-        bs->writeBoolean( info->getGlobalTransactionId().size() != 0 );
+        int rc = TransactionIdMarshaller::tightMarshal1(wireFormat, dataStructure, bs);
+        bs->writeBoolean(info->getGlobalTransactionId().size() != 0);
         rc += info->getGlobalTransactionId().size() == 0 ? 0 : (int)info->getGlobalTransactionId().size() + 4;
-        bs->writeBoolean( info->getBranchQualifier().size() != 0 );
+        bs->writeBoolean(info->getBranchQualifier().size() != 0);
         rc += info->getBranchQualifier().size() == 0 ? 0 : (int)info->getBranchQualifier().size() + 4;
 
         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 XATransactionIdMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) {
+void XATransactionIdMarshaller::tightMarshal2(OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs) {
 
     try {
 
-        TransactionIdMarshaller::tightMarshal2( wireFormat, dataStructure, dataOut, bs );
+        TransactionIdMarshaller::tightMarshal2(wireFormat, dataStructure, dataOut, bs );
 
         XATransactionId* info =
-            dynamic_cast<XATransactionId*>( dataStructure );
-        dataOut->writeInt( info->getFormatId() );
-        if( bs->readBoolean() ) {
-            dataOut->writeInt( (int)info->getGlobalTransactionId().size() );
-            dataOut->write( (const unsigned char*)(&info->getGlobalTransactionId()[0]), (int)info->getGlobalTransactionId().size(), 0, (int)info->getGlobalTransactionId().size() );
+            dynamic_cast<XATransactionId*>(dataStructure);
+        dataOut->writeInt(info->getFormatId());
+        if (bs->readBoolean()) {
+            dataOut->writeInt((int)info->getGlobalTransactionId().size() );
+            dataOut->write((const unsigned char*)(&info->getGlobalTransactionId()[0]), (int)info->getGlobalTransactionId().size(), 0, (int)info->getGlobalTransactionId().size());
         }
-        if( bs->readBoolean() ) {
-            dataOut->writeInt( (int)info->getBranchQualifier().size() );
-            dataOut->write( (const unsigned char*)(&info->getBranchQualifier()[0]), (int)info->getBranchQualifier().size(), 0, (int)info->getBranchQualifier().size() );
+        if (bs->readBoolean()) {
+            dataOut->writeInt((int)info->getBranchQualifier().size() );
+            dataOut->write((const unsigned char*)(&info->getBranchQualifier()[0]), (int)info->getBranchQualifier().size(), 0, (int)info->getBranchQualifier().size());
         }
     }
-    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 XATransactionIdMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) {
+void XATransactionIdMarshaller::looseUnmarshal(OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn) {
 
     try {
 
-        TransactionIdMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
+        TransactionIdMarshaller::looseUnmarshal(wireFormat, dataStructure, dataIn);
         XATransactionId* info =
-            dynamic_cast<XATransactionId*>( dataStructure );
-        info->setFormatId( dataIn->readInt() );
-        info->setGlobalTransactionId( looseUnmarshalByteArray( dataIn ) );
-        info->setBranchQualifier( looseUnmarshalByteArray( dataIn ) );
+            dynamic_cast<XATransactionId*>(dataStructure);
+        info->setFormatId(dataIn->readInt());
+        info->setGlobalTransactionId(looseUnmarshalByteArray(dataIn));
+        info->setBranchQualifier(looseUnmarshalByteArray(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 XATransactionIdMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) {
+void XATransactionIdMarshaller::looseMarshal(OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut) {
 
     try {
 
         XATransactionId* info =
-            dynamic_cast<XATransactionId*>( dataStructure );
-        TransactionIdMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
-        dataOut->writeInt( info->getFormatId() );
+            dynamic_cast<XATransactionId*>(dataStructure);
+        TransactionIdMarshaller::looseMarshal(wireFormat, dataStructure, dataOut);
+        dataOut->writeInt(info->getFormatId());
         dataOut->write( info->getGlobalTransactionId().size() != 0 );
         if( info->getGlobalTransactionId().size() != 0 ) {
             dataOut->writeInt( (int)info->getGlobalTransactionId().size() );
-            dataOut->write( (const unsigned char*)(&info->getGlobalTransactionId()[0]), (int)info->getGlobalTransactionId().size(), 0, (int)info->getGlobalTransactionId().size() );
+            dataOut->write((const unsigned char*)(&info->getGlobalTransactionId()[0]), (int)info->getGlobalTransactionId().size(), 0, (int)info->getGlobalTransactionId().size());
         }
         dataOut->write( info->getBranchQualifier().size() != 0 );
         if( info->getBranchQualifier().size() != 0 ) {
             dataOut->writeInt( (int)info->getBranchQualifier().size() );
-            dataOut->write( (const unsigned char*)(&info->getBranchQualifier()[0]), (int)info->getBranchQualifier().size(), 0, (int)info->getBranchQualifier().size() );
+            dataOut->write((const unsigned char*)(&info->getBranchQualifier()[0]), (int)info->getBranchQualifier().size(), 0, (int)info->getBranchQualifier().size());
         }
     }
-    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/XATransactionIdMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/XATransactionIdMarshaller.h?rev=1460467&r1=1460466&r2=1460467&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/XATransactionIdMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/XATransactionIdMarshaller.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 XATransactionIdMarshaller
@@ -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