Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5822 in orxonox.OLD for trunk/src/lib


Ignore:
Timestamp:
Nov 29, 2005, 2:22:37 PM (19 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"

Location:
trunk/src/lib
Files:
2 deleted
2 edited
18 copied

Legend:

Unmodified
Added
Removed

  • trunk/src/lib/Makefile.am

    r5691 r5822  
    1313                            particles/libORXparticles.a \
    1414                            collision_detection/libORXcd.a \
     15                            network/libORXnet.a \
    1516                            graphics/spatial_separation/libORXquadtree.a \
    1617                            tinyxml/libtinyxml.a \
    … …  
    2627                            particles/libORXparticles.a \
    2728                            collision_detection/libORXcd.a \
     29                            network/libORXnet.a \
    2830                            graphics/spatial_separation/libORXquadtree.a \
    2931                            tinyxml/libtinyxml.a \
    … …  
    7274          particles \
    7375          collision_detection \
     76          network \
    7477          tinyxml \
    7578          shell \

  • trunk/src/lib/lang/class_list.cc

    r5793 r5822  
    2828using namespace std;
    2929
     30#ifndef NO_SHELL_COMMAND
    3031SHELL_COMMAND_STATIC(debug, ClassList, ClassList::debugS)
    3132    ->describe("Shows all registered classes, if param1: is a valid ClassName only values of this class are shown. param2: how much output")
    3233    ->defaultValues(2, NULL, 1);
     34#endif
    3335
    3436/**

  • trunk/src/lib/network/Makefile.in

    r5821 r5822  
    1 # Makefile.in generated by automake 1.9.5 from Makefile.am.
     1# Makefile.in generated by automake 1.9.6 from Makefile.am.
    22# @configure_input@
    33
    … …  
    1515@SET_MAKE@
    1616
    17 
    18 SOURCES = $(libORXnet_a_SOURCES)
    1917
    2018srcdir = @srcdir@

  • trunk/src/lib/network/network_manager.cc

    r5821 r5822  
    2222
    2323#include "network_stream.h"
    24 #include "list.h"
    2524#include "class_list.h"
    2625
    … …  
    162161  if (this->netStreamList != NULL || (this->netStreamList = ClassList::getList(CL_NETWORK_STREAM)) != NULL)
    163162  {
    164     tIterator<BaseObject>* iterator = this->netStreamList->getIterator();
    165     NetworkStream* stream = (NetworkStream*)(iterator->firstElement());
    166     while( stream)
    167     {
    168       stream->processData();
    169       stream = (NetworkStream*)(iterator->nextElement());
    170     }
    171     delete iterator;
     163    std::list<BaseObject*>::iterator stream;
     164    for (stream = this->netStreamList->begin(); stream != this->netStreamList->end(); ++stream)
     165      static_cast<NetworkStream*>(*stream)->processData();
    172166  }
    173167
    174168}
    175 
    176 

  • trunk/src/lib/network/network_manager.h

    r5821 r5822  
    4141
    4242private:
    43   tList<BaseObject>*    netStreamList;            // list with refs to all network streams
    44   tList<BaseObject>*  syncList;                 // list of synchronizeables
     43  std::list<BaseObject*>*    netStreamList;            // list with refs to all network streams
     44  std::list<BaseObject*>*    syncList;                 // list of synchronizeables
    4545
    4646};

  • trunk/src/lib/network/network_socket.h

    r5821 r5822  
    2323
    2424#ifdef HAVE_SDL_H
    25 #include <SDL_Thread.h>
     25 #include <SDL_thread.h>
    2626#else
    27 #include <SDL/SDL_thread.h>
     27 #include <SDL/SDL_thread.h>
    2828#endif
    2929/* include this file, it contains some default definitions */
Note: See TracChangeset for help on using the changeset viewer.