activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r503438 [2/3] - in /activemq/activemq-cpp/trunk/activemq-cpp/src: main/activemq/connector/openwire/commands/ main/activemq/connector/openwire/marshal/v2/ main/activemq/connector/stomp/commands/ main/activemq/transport/ test/activemq/connect...
Date Sun, 04 Feb 2007 16:37:52 GMT
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/MessagePull.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/MessagePull.h?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/MessagePull.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/MessagePull.h Sun Feb  4 08:37:46 2007
@@ -44,7 +44,7 @@
      *         in the activemq-openwire-generator module
      *
      */
-    class MessagePull : public BaseCommand
+    class MessagePull : public BaseCommand<transport::Command>
     {
     protected:
 
@@ -90,8 +90,7 @@
         virtual ActiveMQDestination* getDestination();
         virtual void setDestination( ActiveMQDestination* destination );
 
-        virtual const long long getTimeout() const;
-        virtual long long getTimeout();
+        virtual long long getTimeout() const;
         virtual void setTimeout( long long timeout );
 
     };

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/NetworkBridgeFilter.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/NetworkBridgeFilter.cpp?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/NetworkBridgeFilter.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/NetworkBridgeFilter.cpp Sun Feb  4 08:37:46 2007
@@ -83,12 +83,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-const int NetworkBridgeFilter::getNetworkTTL() const {
-    return networkTTL;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-int NetworkBridgeFilter::getNetworkTTL() {
+int NetworkBridgeFilter::getNetworkTTL() const {
     return networkTTL;
 }
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/NetworkBridgeFilter.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/NetworkBridgeFilter.h?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/NetworkBridgeFilter.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/NetworkBridgeFilter.h Sun Feb  4 08:37:46 2007
@@ -80,8 +80,7 @@
          */
         virtual void copyDataStructure( const DataStructure* src );
 
-        virtual const int getNetworkTTL() const;
-        virtual int getNetworkTTL();
+        virtual int getNetworkTTL() const;
         virtual void setNetworkTTL( int networkTTL );
 
         virtual const BrokerId* getNetworkBrokerId() const;

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/PartialCommand.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/PartialCommand.cpp?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/PartialCommand.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/PartialCommand.cpp Sun Feb  4 08:37:46 2007
@@ -79,12 +79,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-const int PartialCommand::getCommandId() const {
-    return commandId;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-int PartialCommand::getCommandId() {
+int PartialCommand::getCommandId() const {
     return commandId;
 }
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/PartialCommand.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/PartialCommand.h?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/PartialCommand.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/PartialCommand.h Sun Feb  4 08:37:46 2007
@@ -79,8 +79,7 @@
          */
         virtual void copyDataStructure( const DataStructure* src );
 
-        virtual const int getCommandId() const;
-        virtual int getCommandId();
+        virtual int getCommandId() const;
         virtual void setCommandId( int commandId );
 
         virtual const std::vector<unsigned char>& getData() const;

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ProducerId.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ProducerId.cpp?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ProducerId.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ProducerId.cpp Sun Feb  4 08:37:46 2007
@@ -97,12 +97,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-const long long ProducerId::getValue() const {
-    return value;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-long long ProducerId::getValue() {
+long long ProducerId::getValue() const {
     return value;
 }
 
@@ -112,12 +107,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-const long long ProducerId::getSessionId() const {
-    return sessionId;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-long long ProducerId::getSessionId() {
+long long ProducerId::getSessionId() const {
     return sessionId;
 }
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ProducerId.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ProducerId.h?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ProducerId.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ProducerId.h Sun Feb  4 08:37:46 2007
@@ -84,12 +84,10 @@
         virtual std::string& getConnectionId();
         virtual void setConnectionId( const std::string& connectionId );
 
-        virtual const long long getValue() const;
-        virtual long long getValue();
+        virtual long long getValue() const;
         virtual void setValue( long long value );
 
-        virtual const long long getSessionId() const;
-        virtual long long getSessionId();
+        virtual long long getSessionId() const;
         virtual void setSessionId( long long sessionId );
 
     };

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ProducerInfo.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ProducerInfo.cpp?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ProducerInfo.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ProducerInfo.cpp Sun Feb  4 08:37:46 2007
@@ -66,7 +66,7 @@
 void ProducerInfo::copyDataStructure( const DataStructure* src ) {
 
     // Copy the data of the base class or classes
-    BaseCommand::copyDataStructure( src );
+    BaseCommand<transport::Command>::copyDataStructure( src );
 
     const ProducerInfo* srcPtr = dynamic_cast<const ProducerInfo*>( src );
 
@@ -141,12 +141,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-const bool ProducerInfo::isDispatchAsync() const {
-    return dispatchAsync;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool ProducerInfo::isDispatchAsync() {
+bool ProducerInfo::isDispatchAsync() const {
     return dispatchAsync;
 }
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ProducerInfo.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ProducerInfo.h?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ProducerInfo.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ProducerInfo.h Sun Feb  4 08:37:46 2007
@@ -45,7 +45,7 @@
      *         in the activemq-openwire-generator module
      *
      */
-    class ProducerInfo : public BaseCommand
+    class ProducerInfo : public BaseCommand<transport::Command>
     {
     protected:
 
@@ -96,8 +96,7 @@
         virtual std::vector<BrokerId*>& getBrokerPath();
         virtual void setBrokerPath( const std::vector<BrokerId*>& brokerPath );
 
-        virtual const bool isDispatchAsync() const;
-        virtual bool isDispatchAsync();
+        virtual bool isDispatchAsync() const;
         virtual void setDispatchAsync( bool dispatchAsync );
 
     };

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/RemoveInfo.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/RemoveInfo.cpp?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/RemoveInfo.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/RemoveInfo.cpp Sun Feb  4 08:37:46 2007
@@ -60,7 +60,7 @@
 void RemoveInfo::copyDataStructure( const DataStructure* src ) {
 
     // Copy the data of the base class or classes
-    BaseCommand::copyDataStructure( src );
+    BaseCommand<transport::Command>::copyDataStructure( src );
 
     const RemoveInfo* srcPtr = dynamic_cast<const RemoveInfo*>( src );
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/RemoveInfo.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/RemoveInfo.h?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/RemoveInfo.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/RemoveInfo.h Sun Feb  4 08:37:46 2007
@@ -43,7 +43,7 @@
      *         in the activemq-openwire-generator module
      *
      */
-    class RemoveInfo : public BaseCommand
+    class RemoveInfo : public BaseCommand<transport::Command>
     {
     protected:
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/RemoveSubscriptionInfo.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/RemoveSubscriptionInfo.cpp?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/RemoveSubscriptionInfo.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/RemoveSubscriptionInfo.cpp Sun Feb  4 08:37:46 2007
@@ -62,7 +62,7 @@
 void RemoveSubscriptionInfo::copyDataStructure( const DataStructure* src ) {
 
     // Copy the data of the base class or classes
-    BaseCommand::copyDataStructure( src );
+    BaseCommand<transport::Command>::copyDataStructure( src );
 
     const RemoveSubscriptionInfo* srcPtr = dynamic_cast<const RemoveSubscriptionInfo*>( src );
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/RemoveSubscriptionInfo.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/RemoveSubscriptionInfo.h?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/RemoveSubscriptionInfo.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/RemoveSubscriptionInfo.h Sun Feb  4 08:37:46 2007
@@ -43,7 +43,7 @@
      *         in the activemq-openwire-generator module
      *
      */
-    class RemoveSubscriptionInfo : public BaseCommand
+    class RemoveSubscriptionInfo : public BaseCommand<transport::Command>
     {
     protected:
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ReplayCommand.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ReplayCommand.cpp?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ReplayCommand.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ReplayCommand.cpp Sun Feb  4 08:37:46 2007
@@ -60,7 +60,7 @@
 void ReplayCommand::copyDataStructure( const DataStructure* src ) {
 
     // Copy the data of the base class or classes
-    BaseCommand::copyDataStructure( src );
+    BaseCommand<transport::Command>::copyDataStructure( src );
 
     const ReplayCommand* srcPtr = dynamic_cast<const ReplayCommand*>( src );
 
@@ -80,12 +80,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-const int ReplayCommand::getFirstNakNumber() const {
-    return firstNakNumber;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-int ReplayCommand::getFirstNakNumber() {
+int ReplayCommand::getFirstNakNumber() const {
     return firstNakNumber;
 }
 
@@ -95,12 +90,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-const int ReplayCommand::getLastNakNumber() const {
-    return lastNakNumber;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-int ReplayCommand::getLastNakNumber() {
+int ReplayCommand::getLastNakNumber() const {
     return lastNakNumber;
 }
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ReplayCommand.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ReplayCommand.h?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ReplayCommand.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ReplayCommand.h Sun Feb  4 08:37:46 2007
@@ -42,7 +42,7 @@
      *         in the activemq-openwire-generator module
      *
      */
-    class ReplayCommand : public BaseCommand
+    class ReplayCommand : public BaseCommand<transport::Command>
     {
     protected:
 
@@ -79,12 +79,10 @@
          */
         virtual void copyDataStructure( const DataStructure* src );
 
-        virtual const int getFirstNakNumber() const;
-        virtual int getFirstNakNumber();
+        virtual int getFirstNakNumber() const;
         virtual void setFirstNakNumber( int firstNakNumber );
 
-        virtual const int getLastNakNumber() const;
-        virtual int getLastNakNumber();
+        virtual int getLastNakNumber() const;
         virtual void setLastNakNumber( int lastNakNumber );
 
     };

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/Response.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/Response.cpp?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/Response.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/Response.cpp Sun Feb  4 08:37:46 2007
@@ -59,7 +59,7 @@
 void Response::copyDataStructure( const DataStructure* src ) {
 
     // Copy the data of the base class or classes
-    BaseCommand::copyDataStructure( src );
+    BaseCommand<transport::Response>::copyDataStructure( src );
 
     const Response* srcPtr = dynamic_cast<const Response*>( src );
 
@@ -78,12 +78,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-const int Response::getCorrelationId() const {
-    return correlationId;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-int Response::getCorrelationId() {
+int Response::getCorrelationId() const {
     return correlationId;
 }
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/Response.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/Response.h?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/Response.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/Response.h Sun Feb  4 08:37:46 2007
@@ -42,7 +42,7 @@
      *         in the activemq-openwire-generator module
      *
      */
-    class Response : public BaseCommand
+    class Response : public BaseCommand<transport::Response>
     {
     protected:
 
@@ -78,8 +78,7 @@
          */
         virtual void copyDataStructure( const DataStructure* src );
 
-        virtual const int getCorrelationId() const;
-        virtual int getCorrelationId();
+        virtual int getCorrelationId() const;
         virtual void setCorrelationId( int correlationId );
 
     };

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/SessionId.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/SessionId.cpp?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/SessionId.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/SessionId.cpp Sun Feb  4 08:37:46 2007
@@ -95,12 +95,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-const long long SessionId::getValue() const {
-    return value;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-long long SessionId::getValue() {
+long long SessionId::getValue() const {
     return value;
 }
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/SessionId.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/SessionId.h?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/SessionId.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/SessionId.h Sun Feb  4 08:37:46 2007
@@ -83,8 +83,7 @@
         virtual std::string& getConnectionId();
         virtual void setConnectionId( const std::string& connectionId );
 
-        virtual const long long getValue() const;
-        virtual long long getValue();
+        virtual long long getValue() const;
         virtual void setValue( long long value );
 
     };

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/SessionInfo.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/SessionInfo.cpp?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/SessionInfo.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/SessionInfo.cpp Sun Feb  4 08:37:46 2007
@@ -60,7 +60,7 @@
 void SessionInfo::copyDataStructure( const DataStructure* src ) {
 
     // Copy the data of the base class or classes
-    BaseCommand::copyDataStructure( src );
+    BaseCommand<transport::Command>::copyDataStructure( src );
 
     const SessionInfo* srcPtr = dynamic_cast<const SessionInfo*>( src );
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/SessionInfo.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/SessionInfo.h?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/SessionInfo.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/SessionInfo.h Sun Feb  4 08:37:46 2007
@@ -43,7 +43,7 @@
      *         in the activemq-openwire-generator module
      *
      */
-    class SessionInfo : public BaseCommand
+    class SessionInfo : public BaseCommand<transport::Command>
     {
     protected:
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ShutdownInfo.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ShutdownInfo.cpp?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ShutdownInfo.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ShutdownInfo.cpp Sun Feb  4 08:37:46 2007
@@ -58,7 +58,7 @@
 void ShutdownInfo::copyDataStructure( const DataStructure* src ) {
 
     // Copy the data of the base class or classes
-    BaseCommand::copyDataStructure( src );
+    BaseCommand<transport::Command>::copyDataStructure( src );
 
     const ShutdownInfo* srcPtr = dynamic_cast<const ShutdownInfo*>( src );
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ShutdownInfo.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ShutdownInfo.h?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ShutdownInfo.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ShutdownInfo.h Sun Feb  4 08:37:46 2007
@@ -42,7 +42,7 @@
      *         in the activemq-openwire-generator module
      *
      */
-    class ShutdownInfo : public BaseCommand
+    class ShutdownInfo : public BaseCommand<transport::Command>
     {
     protected:
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/TransactionInfo.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/TransactionInfo.cpp?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/TransactionInfo.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/TransactionInfo.cpp Sun Feb  4 08:37:46 2007
@@ -63,7 +63,7 @@
 void TransactionInfo::copyDataStructure( const DataStructure* src ) {
 
     // Copy the data of the base class or classes
-    BaseCommand::copyDataStructure( src );
+    BaseCommand<transport::Command>::copyDataStructure( src );
 
     const TransactionInfo* srcPtr = dynamic_cast<const TransactionInfo*>( src );
 
@@ -118,12 +118,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-const unsigned char TransactionInfo::getType() const {
-    return type;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-unsigned char TransactionInfo::getType() {
+unsigned char TransactionInfo::getType() const {
     return type;
 }
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/TransactionInfo.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/TransactionInfo.h?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/TransactionInfo.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/TransactionInfo.h Sun Feb  4 08:37:46 2007
@@ -44,7 +44,7 @@
      *         in the activemq-openwire-generator module
      *
      */
-    class TransactionInfo : public BaseCommand
+    class TransactionInfo : public BaseCommand<transport::Command>
     {
     protected:
 
@@ -90,8 +90,7 @@
         virtual TransactionId* getTransactionId();
         virtual void setTransactionId( TransactionId* transactionId );
 
-        virtual const unsigned char getType() const;
-        virtual unsigned char getType();
+        virtual unsigned char getType() const;
         virtual void setType( unsigned char type );
 
     };

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/XATransactionId.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/XATransactionId.cpp?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/XATransactionId.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/XATransactionId.cpp Sun Feb  4 08:37:46 2007
@@ -80,12 +80,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-const int XATransactionId::getFormatId() const {
-    return formatId;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-int XATransactionId::getFormatId() {
+int XATransactionId::getFormatId() const {
     return formatId;
 }
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/XATransactionId.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/XATransactionId.h?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/XATransactionId.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/XATransactionId.h Sun Feb  4 08:37:46 2007
@@ -80,8 +80,7 @@
          */
         virtual void copyDataStructure( const DataStructure* src );
 
-        virtual const int getFormatId() const;
-        virtual int getFormatId();
+        virtual int getFormatId() const;
         virtual void setFormatId( int formatId );
 
         virtual const std::vector<unsigned char>& getGlobalTransactionId() const;

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/srcmakefile.mk
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/srcmakefile.mk?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/srcmakefile.mk (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/srcmakefile.mk Sun Feb  4 08:37:46 2007
@@ -28,7 +28,6 @@
    activemq/connector/openwire/commands/ActiveMQTempTopic.cpp \
    activemq/connector/openwire/commands/ActiveMQTextMessage.cpp \
    activemq/connector/openwire/commands/ActiveMQTopic.cpp \
-   activemq/connector/openwire/commands/BaseCommand.cpp \
    activemq/connector/openwire/commands/BrokerId.cpp \
    activemq/connector/openwire/commands/BrokerInfo.cpp \
    activemq/connector/openwire/commands/ConnectionControl.cpp \

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ActiveMQDestinationMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ActiveMQDestinationMarshaller.cpp?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ActiveMQDestinationMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ActiveMQDestinationMarshaller.cpp Sun Feb  4 08:37:46 2007
@@ -71,7 +71,7 @@
 void ActiveMQDestinationMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ) {
 
     BaseDataStreamMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
-    ActiveMQDestination* info = 
+    ActiveMQDestination* info =
         dynamic_cast<ActiveMQDestination*>( dataStructure );
     info->setPhysicalName( looseUnmarshalString( dataIn ) );
 }

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ActiveMQMessageMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ActiveMQMessageMarshaller.cpp?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ActiveMQMessageMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ActiveMQMessageMarshaller.cpp Sun Feb  4 08:37:46 2007
@@ -84,7 +84,7 @@
 void ActiveMQMessageMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ) {
 
     MessageMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
-    ActiveMQMessage* info = 
+    ActiveMQMessage* info =
         dynamic_cast<ActiveMQMessage*>( dataStructure );
     info->beforeUnmarshal( wireFormat );
     info->afterUnmarshal( wireFormat );

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/BaseCommandMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/BaseCommandMarshaller.cpp?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/BaseCommandMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/BaseCommandMarshaller.cpp Sun Feb  4 08:37:46 2007
@@ -40,8 +40,8 @@
 
     BaseDataStreamMarshaller::tightUnmarshal( wireFormat, dataStructure, dataIn, bs );
 
-    BaseCommand* info =
-        dynamic_cast<BaseCommand*>( dataStructure );
+    transport::Command* info =
+        dynamic_cast<transport::Command*>( dataStructure );
     info->setCommandId( dataIn->readInt() );
     info->setResponseRequired( bs->readBoolean() );
 }
@@ -49,8 +49,8 @@
 ///////////////////////////////////////////////////////////////////////////////
 int BaseCommandMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) throw( io::IOException ) {
 
-    BaseCommand* info =
-        dynamic_cast<BaseCommand*>( dataStructure );
+    transport::Command* info =
+        dynamic_cast<transport::Command*>( dataStructure );
 
     int rc = BaseDataStreamMarshaller::tightMarshal1( wireFormat, dataStructure, bs );
     bs->writeBoolean( info->isResponseRequired() );
@@ -63,8 +63,8 @@
 
     BaseDataStreamMarshaller::tightMarshal2( wireFormat, dataStructure, dataOut, bs );
 
-    BaseCommand* info =
-        dynamic_cast<BaseCommand*>( dataStructure );
+    transport::Command* info =
+        dynamic_cast<transport::Command*>( dataStructure );
     dataOut->write( info->getCommandId() );
     bs->readBoolean();
 }
@@ -73,8 +73,8 @@
 void BaseCommandMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ) {
 
     BaseDataStreamMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
-    BaseCommand* info = 
-        dynamic_cast<BaseCommand*>( dataStructure );
+    transport::Command* info =
+        dynamic_cast<transport::Command*>( dataStructure );
     info->setCommandId( dataIn->readInt() );
     info->setResponseRequired( dataIn->readBoolean() );
 }
@@ -82,8 +82,8 @@
 ///////////////////////////////////////////////////////////////////////////////
 void BaseCommandMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) throw( io::IOException ) {
 
-    BaseCommand* info =
-        dynamic_cast<BaseCommand*>( dataStructure );
+    transport::Command* info =
+        dynamic_cast<transport::Command*>( dataStructure );
     BaseDataStreamMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
 
     dataOut->write( info->getCommandId() );

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/BrokerIdMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/BrokerIdMarshaller.cpp?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/BrokerIdMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/BrokerIdMarshaller.cpp Sun Feb  4 08:37:46 2007
@@ -81,7 +81,7 @@
 void BrokerIdMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ) {
 
     BaseDataStreamMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
-    BrokerId* info = 
+    BrokerId* info =
         dynamic_cast<BrokerId*>( dataStructure );
     info->setValue( looseUnmarshalString( dataIn ) );
 }

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/BrokerInfoMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/BrokerInfoMarshaller.cpp?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/BrokerInfoMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/BrokerInfoMarshaller.cpp Sun Feb  4 08:37:46 2007
@@ -120,7 +120,7 @@
 void BrokerInfoMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ) {
 
     BaseCommandMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
-    BrokerInfo* info = 
+    BrokerInfo* info =
         dynamic_cast<BrokerInfo*>( dataStructure );
     info->setBrokerId( dynamic_cast< BrokerId* >( 
         looseUnmarshalCachedObject( wireFormat, dataIn ) ) );

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConnectionControlMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConnectionControlMarshaller.cpp?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConnectionControlMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConnectionControlMarshaller.cpp Sun Feb  4 08:37:46 2007
@@ -80,8 +80,6 @@
 
     BaseCommandMarshaller::tightMarshal2( wireFormat, dataStructure, dataOut, bs );
 
-    ConnectionControl* info =
-        dynamic_cast<ConnectionControl*>( dataStructure );
     bs->readBoolean();
     bs->readBoolean();
     bs->readBoolean();
@@ -93,7 +91,7 @@
 void ConnectionControlMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ) {
 
     BaseCommandMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
-    ConnectionControl* info = 
+    ConnectionControl* info =
         dynamic_cast<ConnectionControl*>( dataStructure );
     info->setClose( dataIn->readBoolean() );
     info->setExit( dataIn->readBoolean() );

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConnectionErrorMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConnectionErrorMarshaller.cpp?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConnectionErrorMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConnectionErrorMarshaller.cpp Sun Feb  4 08:37:46 2007
@@ -86,7 +86,7 @@
 void ConnectionErrorMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ) {
 
     BaseCommandMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
-    ConnectionError* info = 
+    ConnectionError* info =
         dynamic_cast<ConnectionError*>( dataStructure );
     info->setException( dynamic_cast< BrokerError* >(
         looseUnmarshalBrokerError( wireFormat, dataIn ) ) );

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConnectionIdMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConnectionIdMarshaller.cpp?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConnectionIdMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConnectionIdMarshaller.cpp Sun Feb  4 08:37:46 2007
@@ -81,7 +81,7 @@
 void ConnectionIdMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ) {
 
     BaseDataStreamMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
-    ConnectionId* info = 
+    ConnectionId* info =
         dynamic_cast<ConnectionId*>( dataStructure );
     info->setValue( looseUnmarshalString( dataIn ) );
 }

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConnectionInfoMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConnectionInfoMarshaller.cpp?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConnectionInfoMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConnectionInfoMarshaller.cpp Sun Feb  4 08:37:46 2007
@@ -114,7 +114,7 @@
 void ConnectionInfoMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ) {
 
     BaseCommandMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
-    ConnectionInfo* info = 
+    ConnectionInfo* info =
         dynamic_cast<ConnectionInfo*>( dataStructure );
     info->setConnectionId( dynamic_cast< ConnectionId* >( 
         looseUnmarshalCachedObject( wireFormat, dataIn ) ) );

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConsumerControlMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConsumerControlMarshaller.cpp?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConsumerControlMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConsumerControlMarshaller.cpp Sun Feb  4 08:37:46 2007
@@ -96,7 +96,7 @@
 void ConsumerControlMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ) {
 
     BaseCommandMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
-    ConsumerControl* info = 
+    ConsumerControl* info =
         dynamic_cast<ConsumerControl*>( dataStructure );
     info->setClose( dataIn->readBoolean() );
     info->setConsumerId( dynamic_cast< ConsumerId* >( 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConsumerIdMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConsumerIdMarshaller.cpp?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConsumerIdMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConsumerIdMarshaller.cpp Sun Feb  4 08:37:46 2007
@@ -87,7 +87,7 @@
 void ConsumerIdMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ) {
 
     BaseDataStreamMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
-    ConsumerId* info = 
+    ConsumerId* info =
         dynamic_cast<ConsumerId*>( dataStructure );
     info->setConnectionId( looseUnmarshalString( dataIn ) );
     info->setSessionId( looseUnmarshalLong( wireFormat, dataIn ) );

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConsumerInfoMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConsumerInfoMarshaller.cpp?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConsumerInfoMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConsumerInfoMarshaller.cpp Sun Feb  4 08:37:46 2007
@@ -140,7 +140,7 @@
 void ConsumerInfoMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ) {
 
     BaseCommandMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
-    ConsumerInfo* info = 
+    ConsumerInfo* info =
         dynamic_cast<ConsumerInfo*>( dataStructure );
     info->setConsumerId( dynamic_cast< ConsumerId* >( 
         looseUnmarshalCachedObject( wireFormat, dataIn ) ) );

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ControlCommandMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ControlCommandMarshaller.cpp?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ControlCommandMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ControlCommandMarshaller.cpp Sun Feb  4 08:37:46 2007
@@ -81,7 +81,7 @@
 void ControlCommandMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ) {
 
     BaseCommandMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
-    ControlCommand* info = 
+    ControlCommand* info =
         dynamic_cast<ControlCommand*>( dataStructure );
     info->setCommand( looseUnmarshalString( dataIn ) );
 }

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/DataArrayResponseMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/DataArrayResponseMarshaller.cpp?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/DataArrayResponseMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/DataArrayResponseMarshaller.cpp Sun Feb  4 08:37:46 2007
@@ -92,7 +92,7 @@
 void DataArrayResponseMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ) {
 
     ResponseMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
-    DataArrayResponse* info = 
+    DataArrayResponse* info =
         dynamic_cast<DataArrayResponse*>( dataStructure );
 
     if( dataIn->readBoolean() ) {

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/DataResponseMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/DataResponseMarshaller.cpp?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/DataResponseMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/DataResponseMarshaller.cpp Sun Feb  4 08:37:46 2007
@@ -82,7 +82,7 @@
 void DataResponseMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ) {
 
     ResponseMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
-    DataResponse* info = 
+    DataResponse* info =
         dynamic_cast<DataResponse*>( dataStructure );
     info->setData( dynamic_cast< DataStructure* >( 
         looseUnmarshalNestedObject( wireFormat, dataIn ) ) );

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/DestinationInfoMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/DestinationInfoMarshaller.cpp?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/DestinationInfoMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/DestinationInfoMarshaller.cpp Sun Feb  4 08:37:46 2007
@@ -105,7 +105,7 @@
 void DestinationInfoMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ) {
 
     BaseCommandMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
-    DestinationInfo* info = 
+    DestinationInfo* info =
         dynamic_cast<DestinationInfo*>( dataStructure );
     info->setConnectionId( dynamic_cast< ConnectionId* >( 
         looseUnmarshalCachedObject( wireFormat, dataIn ) ) );

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/DiscoveryEventMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/DiscoveryEventMarshaller.cpp?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/DiscoveryEventMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/DiscoveryEventMarshaller.cpp Sun Feb  4 08:37:46 2007
@@ -84,7 +84,7 @@
 void DiscoveryEventMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ) {
 
     BaseDataStreamMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
-    DiscoveryEvent* info = 
+    DiscoveryEvent* info =
         dynamic_cast<DiscoveryEvent*>( dataStructure );
     info->setServiceName( looseUnmarshalString( dataIn ) );
     info->setBrokerName( looseUnmarshalString( dataIn ) );

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ExceptionResponseMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ExceptionResponseMarshaller.cpp?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ExceptionResponseMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ExceptionResponseMarshaller.cpp Sun Feb  4 08:37:46 2007
@@ -82,7 +82,7 @@
 void ExceptionResponseMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ) {
 
     ResponseMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
-    ExceptionResponse* info = 
+    ExceptionResponse* info =
         dynamic_cast<ExceptionResponse*>( dataStructure );
     info->setException( dynamic_cast< BrokerError* >(
         looseUnmarshalBrokerError( wireFormat, dataIn ) ) );

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/IntegerResponseMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/IntegerResponseMarshaller.cpp?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/IntegerResponseMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/IntegerResponseMarshaller.cpp Sun Feb  4 08:37:46 2007
@@ -58,9 +58,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 int IntegerResponseMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) throw( io::IOException ) {
 
-    IntegerResponse* info =
-        dynamic_cast<IntegerResponse*>( dataStructure );
-
     int rc = ResponseMarshaller::tightMarshal1( wireFormat, dataStructure, bs );
 
     return rc + 4;
@@ -80,7 +77,7 @@
 void IntegerResponseMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ) {
 
     ResponseMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
-    IntegerResponse* info = 
+    IntegerResponse* info =
         dynamic_cast<IntegerResponse*>( dataStructure );
     info->setResult( dataIn->readInt() );
 }

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/JournalQueueAckMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/JournalQueueAckMarshaller.cpp?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/JournalQueueAckMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/JournalQueueAckMarshaller.cpp Sun Feb  4 08:37:46 2007
@@ -86,7 +86,7 @@
 void JournalQueueAckMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ) {
 
     BaseDataStreamMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
-    JournalQueueAck* info = 
+    JournalQueueAck* info =
         dynamic_cast<JournalQueueAck*>( dataStructure );
     info->setDestination( dynamic_cast< ActiveMQDestination* >( 
         looseUnmarshalNestedObject( wireFormat, dataIn ) ) );

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/JournalTopicAckMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/JournalTopicAckMarshaller.cpp?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/JournalTopicAckMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/JournalTopicAckMarshaller.cpp Sun Feb  4 08:37:46 2007
@@ -99,7 +99,7 @@
 void JournalTopicAckMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ) {
 
     BaseDataStreamMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
-    JournalTopicAck* info = 
+    JournalTopicAck* info =
         dynamic_cast<JournalTopicAck*>( dataStructure );
     info->setDestination( dynamic_cast< ActiveMQDestination* >( 
         looseUnmarshalNestedObject( wireFormat, dataIn ) ) );

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/JournalTraceMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/JournalTraceMarshaller.cpp?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/JournalTraceMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/JournalTraceMarshaller.cpp Sun Feb  4 08:37:46 2007
@@ -81,7 +81,7 @@
 void JournalTraceMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ) {
 
     BaseDataStreamMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
-    JournalTrace* info = 
+    JournalTrace* info =
         dynamic_cast<JournalTrace*>( dataStructure );
     info->setMessage( looseUnmarshalString( dataIn ) );
 }

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/JournalTransactionMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/JournalTransactionMarshaller.cpp?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/JournalTransactionMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/JournalTransactionMarshaller.cpp Sun Feb  4 08:37:46 2007
@@ -87,7 +87,7 @@
 void JournalTransactionMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ) {
 
     BaseDataStreamMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
-    JournalTransaction* info = 
+    JournalTransaction* info =
         dynamic_cast<JournalTransaction*>( dataStructure );
     info->setTransactionId( dynamic_cast< TransactionId* >( 
         looseUnmarshalNestedObject( wireFormat, dataIn ) ) );

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/LocalTransactionIdMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/LocalTransactionIdMarshaller.cpp?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/LocalTransactionIdMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/LocalTransactionIdMarshaller.cpp Sun Feb  4 08:37:46 2007
@@ -85,7 +85,7 @@
 void LocalTransactionIdMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ) {
 
     TransactionIdMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
-    LocalTransactionId* info = 
+    LocalTransactionId* info =
         dynamic_cast<LocalTransactionId*>( dataStructure );
     info->setValue( looseUnmarshalLong( wireFormat, dataIn ) );
     info->setConnectionId( dynamic_cast< ConnectionId* >( 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/MessageAckMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/MessageAckMarshaller.cpp?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/MessageAckMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/MessageAckMarshaller.cpp Sun Feb  4 08:37:46 2007
@@ -102,7 +102,7 @@
 void MessageAckMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ) {
 
     BaseCommandMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
-    MessageAck* info = 
+    MessageAck* info =
         dynamic_cast<MessageAck*>( dataStructure );
     info->setDestination( dynamic_cast< ActiveMQDestination* >( 
         looseUnmarshalCachedObject( wireFormat, dataIn ) ) );

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/MessageDispatchMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/MessageDispatchMarshaller.cpp?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/MessageDispatchMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/MessageDispatchMarshaller.cpp Sun Feb  4 08:37:46 2007
@@ -92,7 +92,7 @@
 void MessageDispatchMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ) {
 
     BaseCommandMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
-    MessageDispatch* info = 
+    MessageDispatch* info =
         dynamic_cast<MessageDispatch*>( dataStructure );
     info->setConsumerId( dynamic_cast< ConsumerId* >( 
         looseUnmarshalCachedObject( wireFormat, dataIn ) ) );

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/MessageDispatchNotificationMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/MessageDispatchNotificationMarshaller.cpp?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/MessageDispatchNotificationMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/MessageDispatchNotificationMarshaller.cpp Sun Feb  4 08:37:46 2007
@@ -93,7 +93,7 @@
 void MessageDispatchNotificationMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ) {
 
     BaseCommandMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
-    MessageDispatchNotification* info = 
+    MessageDispatchNotification* info =
         dynamic_cast<MessageDispatchNotification*>( dataStructure );
     info->setConsumerId( dynamic_cast< ConsumerId* >( 
         looseUnmarshalCachedObject( wireFormat, dataIn ) ) );

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/MessageIdMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/MessageIdMarshaller.cpp?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/MessageIdMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/MessageIdMarshaller.cpp Sun Feb  4 08:37:46 2007
@@ -88,7 +88,7 @@
 void MessageIdMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ) {
 
     BaseDataStreamMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
-    MessageId* info = 
+    MessageId* info =
         dynamic_cast<MessageId*>( dataStructure );
     info->setProducerId( dynamic_cast< ProducerId* >( 
         looseUnmarshalCachedObject( wireFormat, dataIn ) ) );

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/MessageMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/MessageMarshaller.cpp?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/MessageMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/MessageMarshaller.cpp Sun Feb  4 08:37:46 2007
@@ -111,9 +111,9 @@
     rc += tightMarshalLong1( wireFormat, info->getTimestamp(), bs );
     rc += tightMarshalString1( info->getType(), bs );
     bs->writeBoolean( info->getContent().size() != 0 );
-    rc += (int)(info->getContent().size() == 0 ? 0 : info->getContent().size() + 4);
+    rc += info->getContent().size() == 0 ? 0 : info->getContent().size() + 4;
     bs->writeBoolean( info->getMarshalledProperties().size() != 0 );
-    rc += (int)(info->getMarshalledProperties().size() == 0 ? 0 : info->getMarshalledProperties().size() + 4);
+    rc += info->getMarshalledProperties().size() == 0 ? 0 : info->getMarshalledProperties().size() + 4;
     rc += tightMarshalNestedObject1( wireFormat, info->getDataStructure(), bs );
     rc += tightMarshalCachedObject1( wireFormat, info->getTargetConsumerId(), bs );
     bs->writeBoolean( info->isCompressed() );
@@ -150,11 +150,11 @@
     tightMarshalString2( info->getType(), dataOut, bs );
     if( bs->readBoolean() ) {
         dataOut->write( (int)info->getContent().size() );
-        dataOut->write( &info->getContent()[0], info->getContent().size() );
+        dataOut->write( (const unsigned char*)(&info->getContent()[0]), (int)info->getContent().size() );
     }
     if( bs->readBoolean() ) {
         dataOut->write( (int)info->getMarshalledProperties().size() );
-        dataOut->write( &info->getMarshalledProperties()[0], info->getMarshalledProperties().size() );
+        dataOut->write( (const unsigned char*)(&info->getMarshalledProperties()[0]), (int)info->getMarshalledProperties().size() );
     }
     tightMarshalNestedObject2( wireFormat, info->getDataStructure(), dataOut, bs );
     tightMarshalCachedObject2( wireFormat, info->getTargetConsumerId(), dataOut, bs );
@@ -171,7 +171,7 @@
 void MessageMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ) {
 
     BaseCommandMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
-    Message* info = 
+    Message* info =
         dynamic_cast<Message*>( dataStructure );
     info->setProducerId( dynamic_cast< ProducerId* >( 
         looseUnmarshalCachedObject( wireFormat, dataIn ) ) );
@@ -246,12 +246,12 @@
     dataOut->write( info->getContent().size() != 0 );
     if( info->getContent().size() != 0 ) {
         dataOut->write( (int)info->getContent().size() );
-        dataOut->write( &info->getContent()[0], info->getContent().size() );
+        dataOut->write( (const unsigned char*)(&info->getContent()[0]), (int)info->getContent().size() );
     }
     dataOut->write( info->getMarshalledProperties().size() != 0 );
     if( info->getMarshalledProperties().size() != 0 ) {
         dataOut->write( (int)info->getMarshalledProperties().size() );
-        dataOut->write( &info->getMarshalledProperties()[0], info->getMarshalledProperties().size() );
+        dataOut->write( (const unsigned char*)(&info->getMarshalledProperties()[0]), (int)info->getMarshalledProperties().size() );
     }
     looseMarshalNestedObject( wireFormat, info->getDataStructure(), dataOut );
     looseMarshalCachedObject( wireFormat, info->getTargetConsumerId(), dataOut );

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/MessagePullMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/MessagePullMarshaller.cpp?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/MessagePullMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/MessagePullMarshaller.cpp Sun Feb  4 08:37:46 2007
@@ -89,7 +89,7 @@
 void MessagePullMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ) {
 
     BaseCommandMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
-    MessagePull* info = 
+    MessagePull* info =
         dynamic_cast<MessagePull*>( dataStructure );
     info->setConsumerId( dynamic_cast< ConsumerId* >( 
         looseUnmarshalCachedObject( wireFormat, dataIn ) ) );

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/NetworkBridgeFilterMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/NetworkBridgeFilterMarshaller.cpp?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/NetworkBridgeFilterMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/NetworkBridgeFilterMarshaller.cpp Sun Feb  4 08:37:46 2007
@@ -84,7 +84,7 @@
 void NetworkBridgeFilterMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ) {
 
     BaseDataStreamMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
-    NetworkBridgeFilter* info = 
+    NetworkBridgeFilter* info =
         dynamic_cast<NetworkBridgeFilter*>( dataStructure );
     info->setNetworkTTL( dataIn->readInt() );
     info->setNetworkBrokerId( dynamic_cast< BrokerId* >( 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/PartialCommandMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/PartialCommandMarshaller.cpp?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/PartialCommandMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/PartialCommandMarshaller.cpp Sun Feb  4 08:37:46 2007
@@ -64,7 +64,7 @@
 
     int rc = BaseDataStreamMarshaller::tightMarshal1( wireFormat, dataStructure, bs );
     bs->writeBoolean( info->getData().size() != 0 );
-    rc += (int)(info->getData().size() == 0 ? 0 : info->getData().size() + 4);
+    rc += info->getData().size() == 0 ? 0 : info->getData().size() + 4;
 
     return rc + 4;
 }
@@ -79,7 +79,7 @@
     dataOut->write( info->getCommandId() );
     if( bs->readBoolean() ) {
         dataOut->write( (int)info->getData().size() );
-        dataOut->write( &info->getData()[0], info->getData().size() );
+        dataOut->write( (const unsigned char*)(&info->getData()[0]), (int)info->getData().size() );
     }
 }
 
@@ -87,7 +87,7 @@
 void PartialCommandMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ) {
 
     BaseDataStreamMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
-    PartialCommand* info = 
+    PartialCommand* info =
         dynamic_cast<PartialCommand*>( dataStructure );
     info->setCommandId( dataIn->readInt() );
     info->setData( looseUnmarshalByteArray( dataIn ) );
@@ -104,7 +104,7 @@
     dataOut->write( info->getData().size() != 0 );
     if( info->getData().size() != 0 ) {
         dataOut->write( (int)info->getData().size() );
-        dataOut->write( &info->getData()[0], info->getData().size() );
+        dataOut->write( (const unsigned char*)(&info->getData()[0]), (int)info->getData().size() );
     }
 }
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ProducerIdMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ProducerIdMarshaller.cpp?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ProducerIdMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ProducerIdMarshaller.cpp Sun Feb  4 08:37:46 2007
@@ -87,7 +87,7 @@
 void ProducerIdMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ) {
 
     BaseDataStreamMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
-    ProducerId* info = 
+    ProducerId* info =
         dynamic_cast<ProducerId*>( dataStructure );
     info->setConnectionId( looseUnmarshalString( dataIn ) );
     info->setValue( looseUnmarshalLong( wireFormat, dataIn ) );

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ProducerInfoMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ProducerInfoMarshaller.cpp?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ProducerInfoMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ProducerInfoMarshaller.cpp Sun Feb  4 08:37:46 2007
@@ -103,7 +103,7 @@
 void ProducerInfoMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ) {
 
     BaseCommandMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
-    ProducerInfo* info = 
+    ProducerInfo* info =
         dynamic_cast<ProducerInfo*>( dataStructure );
     info->setProducerId( dynamic_cast< ProducerId* >( 
         looseUnmarshalCachedObject( wireFormat, dataIn ) ) );

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/RemoveInfoMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/RemoveInfoMarshaller.cpp?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/RemoveInfoMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/RemoveInfoMarshaller.cpp Sun Feb  4 08:37:46 2007
@@ -82,7 +82,7 @@
 void RemoveInfoMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ) {
 
     BaseCommandMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
-    RemoveInfo* info = 
+    RemoveInfo* info =
         dynamic_cast<RemoveInfo*>( dataStructure );
     info->setObjectId( dynamic_cast< DataStructure* >( 
         looseUnmarshalCachedObject( wireFormat, dataIn ) ) );

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/RemoveSubscriptionInfoMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/RemoveSubscriptionInfoMarshaller.cpp?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/RemoveSubscriptionInfoMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/RemoveSubscriptionInfoMarshaller.cpp Sun Feb  4 08:37:46 2007
@@ -88,7 +88,7 @@
 void RemoveSubscriptionInfoMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ) {
 
     BaseCommandMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
-    RemoveSubscriptionInfo* info = 
+    RemoveSubscriptionInfo* info =
         dynamic_cast<RemoveSubscriptionInfo*>( dataStructure );
     info->setConnectionId( dynamic_cast< ConnectionId* >( 
         looseUnmarshalCachedObject( wireFormat, dataIn ) ) );

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ReplayCommandMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ReplayCommandMarshaller.cpp?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ReplayCommandMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ReplayCommandMarshaller.cpp Sun Feb  4 08:37:46 2007
@@ -59,9 +59,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 int ReplayCommandMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) throw( io::IOException ) {
 
-    ReplayCommand* info =
-        dynamic_cast<ReplayCommand*>( dataStructure );
-
     int rc = BaseCommandMarshaller::tightMarshal1( wireFormat, dataStructure, bs );
 
     return rc + 8;
@@ -82,7 +79,7 @@
 void ReplayCommandMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ) {
 
     BaseCommandMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
-    ReplayCommand* info = 
+    ReplayCommand* info =
         dynamic_cast<ReplayCommand*>( dataStructure );
     info->setFirstNakNumber( dataIn->readInt() );
     info->setLastNakNumber( dataIn->readInt() );

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ResponseMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ResponseMarshaller.cpp?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ResponseMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ResponseMarshaller.cpp Sun Feb  4 08:37:46 2007
@@ -58,9 +58,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 int ResponseMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) throw( io::IOException ) {
 
-    Response* info =
-        dynamic_cast<Response*>( dataStructure );
-
     int rc = BaseCommandMarshaller::tightMarshal1( wireFormat, dataStructure, bs );
 
     return rc + 4;
@@ -80,7 +77,7 @@
 void ResponseMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ) {
 
     BaseCommandMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
-    Response* info = 
+    Response* info =
         dynamic_cast<Response*>( dataStructure );
     info->setCorrelationId( dataIn->readInt() );
 }

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/SessionIdMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/SessionIdMarshaller.cpp?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/SessionIdMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/SessionIdMarshaller.cpp Sun Feb  4 08:37:46 2007
@@ -84,7 +84,7 @@
 void SessionIdMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ) {
 
     BaseDataStreamMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
-    SessionId* info = 
+    SessionId* info =
         dynamic_cast<SessionId*>( dataStructure );
     info->setConnectionId( looseUnmarshalString( dataIn ) );
     info->setValue( looseUnmarshalLong( wireFormat, dataIn ) );

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/SessionInfoMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/SessionInfoMarshaller.cpp?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/SessionInfoMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/SessionInfoMarshaller.cpp Sun Feb  4 08:37:46 2007
@@ -82,7 +82,7 @@
 void SessionInfoMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ) {
 
     BaseCommandMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
-    SessionInfo* info = 
+    SessionInfo* info =
         dynamic_cast<SessionInfo*>( dataStructure );
     info->setSessionId( dynamic_cast< SessionId* >( 
         looseUnmarshalCachedObject( wireFormat, dataIn ) ) );

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/SubscriptionInfoMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/SubscriptionInfoMarshaller.cpp?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/SubscriptionInfoMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/SubscriptionInfoMarshaller.cpp Sun Feb  4 08:37:46 2007
@@ -91,7 +91,7 @@
 void SubscriptionInfoMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ) {
 
     BaseDataStreamMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
-    SubscriptionInfo* info = 
+    SubscriptionInfo* info =
         dynamic_cast<SubscriptionInfo*>( dataStructure );
     info->setClientId( looseUnmarshalString( dataIn ) );
     info->setDestination( dynamic_cast< ActiveMQDestination* >( 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/TransactionIdMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/TransactionIdMarshaller.cpp?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/TransactionIdMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/TransactionIdMarshaller.cpp Sun Feb  4 08:37:46 2007
@@ -36,16 +36,6 @@
 using namespace activemq::connector::openwire::marshal::v2;
 
 ///////////////////////////////////////////////////////////////////////////////
-unsigned char TransactionIdMarshaller::getDataStructureType() const {
-    return TransactionId::ID_TRANSACTIONID;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-commands::DataStructure* TransactionIdMarshaller::createObject() const {
-    return new TransactionId();
-}
-
-///////////////////////////////////////////////////////////////////////////////
 void TransactionIdMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( io::IOException ) {
 
     BaseDataStreamMarshaller::tightUnmarshal( wireFormat, dataStructure, dataIn, bs );

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/TransactionIdMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/TransactionIdMarshaller.h?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/TransactionIdMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/TransactionIdMarshaller.h Sun Feb  4 08:37:46 2007
@@ -53,18 +53,6 @@
         virtual ~TransactionIdMarshaller() {}
 
         /**
-         * Creates a new instance of this marshalable type.
-         * @return new DataStructure object pointer caller owns it.
-         */
-        virtual commands::DataStructure* createObject() const;
-
-        /**
-         * Get the Data Structure Type that identifies this Marshaller
-         * @return byte holding the data structure type value
-         */
-        virtual unsigned char getDataStructureType() const;
-
-        /**
          * Un-marshal an object instance from the data input stream
          * @param wireFormat - describs the wire format of the broker
          * @param o - Object to be un-marshaled

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/TransactionInfoMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/TransactionInfoMarshaller.cpp?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/TransactionInfoMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/TransactionInfoMarshaller.cpp Sun Feb  4 08:37:46 2007
@@ -88,7 +88,7 @@
 void TransactionInfoMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ) {
 
     BaseCommandMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
-    TransactionInfo* info = 
+    TransactionInfo* info =
         dynamic_cast<TransactionInfo*>( dataStructure );
     info->setConnectionId( dynamic_cast< ConnectionId* >( 
         looseUnmarshalCachedObject( wireFormat, dataIn ) ) );



Mime
View raw message