Changeset 5822 in orxonox.OLD for trunk/src/lib/network/network_manager.cc

Timestamp:

Nov 29, 2005, 2:22:37 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged branches/network to the trunk
merged with command:
svn merge -r 5505:HEAD branches/network trunk

conflicts resolved in favor of the trunk (as always
also fixed a typo in the #include "SDL_tread.h"

File:

• trunk/src/lib/network/network_manager.cc (copied) (copied from branches/network/src/lib/network/network_manager.cc) (2 diffs)

trunk/src/lib/network/network_manager.cc

@@ -22 +22 @@
 
 #include "network_stream.h"
-#include "list.h"
 #include "class_list.h"
 
@@ -162 +161 @@
   if (this->netStreamList != NULL || (this->netStreamList = ClassList::getList(CL_NETWORK_STREAM)) != NULL)
   {
-    tIterator<BaseObject>* iterator = this->netStreamList->getIterator();
-    NetworkStream* stream = (NetworkStream*)(iterator->firstElement());
-    while( stream)
-    {
-      stream->processData();
-      stream = (NetworkStream*)(iterator->nextElement());
-    }
-    delete iterator;
+    std::list<BaseObject*>::iterator stream;
+    for (stream = this->netStreamList->begin(); stream != this->netStreamList->end(); ++stream)
+      static_cast<NetworkStream*>(*stream)->processData();
   }
 
 }
-
-