Changeset 12774 for source/ariba/utility/transport/messages/message.hpp

Timestamp:

Mar 26, 2014, 6:44:32 PM (10 years ago)

Author:

hock@…

Message:

StreamTransport bug fixed!!

[ Back to normal. :-) ]

File:

• source/ariba/utility/transport/messages/message.hpp (modified) (7 diffs)

source/ariba/utility/transport/messages/message.hpp

@@ -69 +69 @@
         /// Create a new message
         inline message_t() :
-                imsg(),
-                MAGIC_IDENTIFIER("!!message_t-MAGIC_IDENTIFIER!!"), // XXX Mario: Debugging
-                MAGIC_NUMBER(421337) // XXX Mario: Debugging
+                imsg()
         {
         }
@@ -77 +75 @@
         /// Copy message
         inline message_t(const message_t& msg) :
-                imsg(msg.imsg),
-                MAGIC_IDENTIFIER(msg.MAGIC_IDENTIFIER),  // XXX
-                MAGIC_NUMBER(msg.MAGIC_NUMBER) // XXX
+                imsg(msg.imsg)
 
         {
-                assert ( msg.MAGIC_NUMBER == 421337 ); // XXX
-                
             if ( imsg )
                 imsg->owner = NULL;
@@ -96 +90 @@
         inline message_t& operator=(const message_t& msg)
         {
-                assert ( msg.MAGIC_NUMBER == 421337 ); // XXX
-                
                 if ( msg.imsg )
                 {
@@ -105 +97 @@
                 else
                 {
-                        // TODO: is this a valid state? (since it can definitely been reached...)
                         imsg.reset();
                 }
@@ -274 +265 @@
                 mlength_t index, length;
                 
-                // XXX Mario: Debugging
-                const std::string MAGIC_IDENTIFIER;
-                const int MAGIC_NUMBER;
         public:
                 inline imsg_t() :
                         owner(NULL),
                         index(0),
-                        length(0),
-                        MAGIC_IDENTIFIER("!!imsg_t-MAGIC_IDENTIFIER!!"), // XXX Mario: Debugging
-                        MAGIC_NUMBER(133742)
+                        length(0)
                 {
                 }
                 inline imsg_t(const imsg_t& imsg) :
-                        index(imsg.index), length(imsg.length),
-                        MAGIC_IDENTIFIER(imsg.MAGIC_IDENTIFIER),  // XXX
-                        MAGIC_NUMBER(imsg.MAGIC_NUMBER) // XXX
+                        index(imsg.index), length(imsg.length)
                 {
                         for (mlength_t i = 0; i < length; i++)
@@ -359 +343 @@
                         length--;
                 }
-        };
+        }; // [ class imsg_t ] -- inner class
+        
         /// own a new message
         inline imsg_t& own() {
@@ -368 +353 @@
                 return *imsg;
         }
-        boost::shared_ptr<imsg_t> imsg;
-        
-        // XXX Mario: Debugging
-public:
-        const std::string MAGIC_IDENTIFIER;
-        const int MAGIC_NUMBER;
-};
+        boost::shared_ptr<imsg_t> imsg; 
+}; // [ class message_t ] -- outer class
 
 inline message_t operator+(const message_t& lhs, const message_t& rhs) {