Changeset 3304 for code/trunk/src/network/synchronisable/Synchronisable.cc

Timestamp:

Jul 18, 2009, 6:23:31 PM (15 years ago)

Author:

rgrieder

Message:

Merged netp6 branch back to the trunk.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/network/synchronisable/Synchronisable.cc (modified) (2 diffs)

code/trunk/src/network/synchronisable/Synchronisable.cc

@@ -96 +96 @@
       if (this->objectMode_ != 0x0 && (Host::running() && Host::isServer()))
         deletedObjects_.push(objectID);
-      // delete all Synchronisable Variables from syncList ( which are also in stringList )
-      for(std::vector<SynchronisableVariableBase*>::iterator it = syncList.begin(); it!=syncList.end(); it++)
-        delete (*it);
-      syncList.clear();
-      stringList.clear();
-    }
+    }
+    // delete all Synchronisable Variables from syncList ( which are also in stringList )
+    for(std::vector<SynchronisableVariableBase*>::iterator it = syncList.begin(); it!=syncList.end(); it++)
+      delete (*it);
+    syncList.clear();
+    stringList.clear();
     std::map<uint32_t, Synchronisable*>::iterator it;
     it = objectMap_.find(objectID);
@@ -247 +247 @@
       return 0;
     uint32_t tempsize = 0;
+#ifndef NDEBUG
     if (this->classID==0)
       COUT(3) << "classid 0 " << this->getIdentifier()->getName() << std::endl;
+#endif
 
     if (this->classID == static_cast<uint32_t>(-1))