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

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.h (copied) (copied from branches/network/src/lib/network/network_manager.h) (1 diff)

trunk/src/lib/network/network_manager.h

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