[Orxonox-commit 1076] r5797 - in code/branches/core5/src/libraries/network: . synchronisable

[landauf at orxonox.net]

Author: landauf
Date: 2009-09-26 22:17:21 +0200 (Sat, 26 Sep 2009)
New Revision: 5797

Modified:
   code/branches/core5/src/libraries/network/GamestateClient.cc
   code/branches/core5/src/libraries/network/GamestateManager.cc
   code/branches/core5/src/libraries/network/NetworkFunction.cc
   code/branches/core5/src/libraries/network/synchronisable/Synchronisable.cc
Log:
replaced delete with destroy() in network

Modified: code/branches/core5/src/libraries/network/GamestateClient.cc
===================================================================
--- code/branches/core5/src/libraries/network/GamestateClient.cc	2009-09-26 20:15:53 UTC (rev 5796)
+++ code/branches/core5/src/libraries/network/GamestateClient.cc	2009-09-26 20:17:21 UTC (rev 5797)
@@ -107,7 +107,7 @@
   void GamestateClient::removeObject(ObjectList<Synchronisable>::iterator &it) {
     ObjectList<Synchronisable>::iterator temp=it;
     ++it;
-    delete  *temp;
+    temp->destroy(); // or delete?
   }
 
   packet::Gamestate *GamestateClient::getGamestate(){

Modified: code/branches/core5/src/libraries/network/GamestateManager.cc
===================================================================
--- code/branches/core5/src/libraries/network/GamestateManager.cc	2009-09-26 20:15:53 UTC (rev 5796)
+++ code/branches/core5/src/libraries/network/GamestateManager.cc	2009-09-26 20:17:21 UTC (rev 5797)
@@ -76,7 +76,7 @@
       for( it2 = it1->second.begin(); it2 != it1->second.end(); ++it2 )
         delete (*it2).second;
     }
-    delete this->trafficControl_;
+    this->trafficControl_->destroy();
 //     delete this->threadMutex_;
 //     delete this->threadPool_;
   }

Modified: code/branches/core5/src/libraries/network/NetworkFunction.cc
===================================================================
--- code/branches/core5/src/libraries/network/NetworkFunction.cc	2009-09-26 20:15:53 UTC (rev 5796)
+++ code/branches/core5/src/libraries/network/NetworkFunction.cc	2009-09-26 20:17:21 UTC (rev 5797)
@@ -59,7 +59,7 @@
   {
     std::map<std::string, NetworkFunctionBase*>::iterator it;
     for( it=NetworkFunctionBase::nameMap_.begin(); it!=NetworkFunctionBase::nameMap_.end(); ++it )
-      delete it->second;
+      it->second->destroy();
   }
   
   

Modified: code/branches/core5/src/libraries/network/synchronisable/Synchronisable.cc
===================================================================
--- code/branches/core5/src/libraries/network/synchronisable/Synchronisable.cc	2009-09-26 20:15:53 UTC (rev 5796)
+++ code/branches/core5/src/libraries/network/synchronisable/Synchronisable.cc	2009-09-26 20:17:21 UTC (rev 5797)
@@ -200,7 +200,7 @@
     assert(getSynchronisable(objectID)->objectID==objectID);
     Synchronisable *s = getSynchronisable(objectID);
     if(s)
-      delete s;
+      s->destroy(); // or delete?
     else
       return false;
     return true;