Changeset 2144

Timestamp:

Nov 5, 2008, 5:32:54 PM (15 years ago)

Author:

scheusso

Message:

small change in synchronisable and baseobject (check when changing activity)

Location:

code/branches/objecthierarchy/src

Files:

• core/BaseObject.h (modified) (1 diff)
• network/Synchronisable.cc (modified) (1 diff)

code/branches/objecthierarchy/src/core/BaseObject.h

@@ -72 +72 @@
 
             /** @brief Sets the state of the objects activity. @param bActive True = active */
-            inline void setActive(bool bActive) { this->bActive_ = bActive; this->changedActivity(); }
+            inline void setActive(bool bActive)
+            { 
+                bool bTemp = this->bActive_;
+                this->bActive_ = bActive;
+                if ( bTemp != bActive )
+                    this->changedActivity();
+            }
             /** @brief Returns the state of the objects activity. @return The state of the activity */
             inline bool isActive() const { return this->bActive_; }

code/branches/objecthierarchy/src/network/Synchronisable.cc

@@ -297 +297 @@
         it++;
     }
-    assert(0); //if we reach this point something went wrong
+    bool unregistered_nonexistent_variable = false;
+    assert(unregistered_nonexistent_variable); //if we reach this point something went wrong:
+    // the variable has not been registered before
   }