Changeset 5924 in orxonox.OLD for branches/avi_play/src/lib/network

Timestamp:

Dec 4, 2005, 11:37:49 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/avi_play: merged the Trunk back into the branche avi_play again

merged with command svn merge ../trunk/ avi_play/ -r5845:HEAD
no conflicts

Location:

branches/avi_play/src/lib/network

Files:

• network_manager.cc (modified) (1 diff)
• network_manager.h (modified) (1 diff)

branches/avi_play/src/lib/network/network_manager.cc

@@ -161 +161 @@
   if (this->netStreamList != NULL || (this->netStreamList = ClassList::getList(CL_NETWORK_STREAM)) != NULL)
   {
-    std::list<BaseObject*>::iterator stream;
+    std::list<BaseObject*>::const_iterator stream;
     for (stream = this->netStreamList->begin(); stream != this->netStreamList->end(); ++stream)
       static_cast<NetworkStream*>(*stream)->processData();

branches/avi_play/src/lib/network/network_manager.h

@@ -41 +41 @@
 
 private:
-  std::list<BaseObject*>*    netStreamList;            // list with refs to all network streams
-  std::list<BaseObject*>*    syncList;                 // list of synchronizeables
+  const std::list<BaseObject*>*    netStreamList;            // list with refs to all network streams
+  const std::list<BaseObject*>*    syncList;                 // list of synchronizeables
 
 };