Mon Mar 16 12:29:22 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>

        * ace/Configuration.cpp:
        * ace/System_Time.cpp:
          Initialise pointers with 0

        * ace/MEM_Acceptor.h:
          Doxygen fix

        * ace/Monitor_Control_Types.cpp (operator=):
          Check for self assignment

        * ace/Name_Space.cpp:
        * ace/Name_Space.h:
          Let operator= return a value

        * ace/SOCK.h:
          Layout change

        * ace/UUID.cpp:
          Simplified operator=

1 files changed, 13 insertions, 13 deletions

diff --git a/ACE/ace/UUID.cpp b/ACE/ace/UUID.cpp
index 2a4d4fe6e63..d43bbc8139c 100644
--- a/ACE/ace/UUID.cpp
+++ b/ACE/ace/UUID.cpp
@@ -113,19 +113,19 @@ namespace ACE_Utils
   const UUID &
   UUID::operator = (const UUID & rhs)
   {
-    if (this == &rhs)
-      return *this;
-
-    // Copy the values of the UUID.
-    this->time_low_ = rhs.time_low_;
-    this->time_mid_ = rhs.time_mid_;
-    this->time_hi_and_version_ = rhs.time_hi_and_version_;
-    this->clock_seq_hi_and_reserved_ = rhs.clock_seq_hi_and_reserved_;
-    this->clock_seq_low_ = rhs.clock_seq_low_;
-    this->node_ = rhs.node_;
-
-    // Delete the string version of the UUID.
-    this->as_string_.reset (0);
+    if (this != &rhs)
+      {
+        // Copy the values of the UUID.
+        this->time_low_ = rhs.time_low_;
+        this->time_mid_ = rhs.time_mid_;
+        this->time_hi_and_version_ = rhs.time_hi_and_version_;
+        this->clock_seq_hi_and_reserved_ = rhs.clock_seq_hi_and_reserved_;
+        this->clock_seq_low_ = rhs.clock_seq_low_;
+        this->node_ = rhs.node_;
+
+        // Delete the string version of the UUID.
+        this->as_string_.reset (0);
+      }
     return *this;
   }