Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Jun 23, 2009, 6:02:25 PM (15 years ago)
Author:
scheusso
Message:

merged netp5 back to trunk

Location:
code/trunk/src/network/synchronisable
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • code/trunk/src/network/synchronisable/NetworkCallback.h

    r3068 r3214  
    2828
    2929
    30 #ifndef _NETWORK_CALLBACK__
    31 #define _NETWORK_CALLBACK__
     30#ifndef _NetworkCallback_H__
     31#define _NetworkCallback_H__
    3232
    3333#include "network/NetworkPrereqs.h"
    … …  
    6161
    6262
    63 #endif
     63#endif /* _NetworkCallback_H__ */

  • code/trunk/src/network/synchronisable/NetworkCallbackManager.cc

    r3084 r3214  
    2727 */
    2828 
    29 
    3029#include "NetworkCallbackManager.h"
    3130#include "NetworkCallback.h"

  • code/trunk/src/network/synchronisable/NetworkCallbackManager.h

    r2662 r3214  
    2828
    2929
    30 #ifndef _NETWORK_CALLBACKMANAGER__
    31 #define _NETWORK_CALLBACKMANAGER__
     30#ifndef _NetworkCallbackManager_H__
     31#define _NetworkCallbackManager_H__
    3232
    3333#include "network/NetworkPrereqs.h"
     34
    3435#include <set>
    3536#include <queue>
    … …  
    5253
    5354
    54 #endif
     55#endif /* _NetworkCallbackManager_H__ */

  • code/trunk/src/network/synchronisable/Synchronisable.cc

    r3198 r3214  
    3131#include "Synchronisable.h"
    3232
    33 #include <cstring>
    34 #include <string>
    35 #include <iostream>
    36 #include <cassert>
    37 
     33#include <cstdlib>
    3834#include "core/CoreIncludes.h"
    3935#include "core/BaseObject.h"
    40 // #include "core/Identifier.h"
    41 
    4236#include "network/Host.h"
     37
    4338namespace orxonox
    4439{

  • code/trunk/src/network/synchronisable/Synchronisable.h

    r3084 r3214  
    3232#include "network/NetworkPrereqs.h"
    3333
    34 #include <list>
     34#include <cassert>
     35#include <cstring>
    3536#include <vector>
    3637#include <map>
    3738#include <queue>
    38 #include <cassert>
    39 #include <string>
    40 #include "util/Math.h"
     39
    4140#include "util/mbool.h"
    4241#include "core/OrxonoxClass.h"
     42#include "SynchronisableVariable.h"
    4343#include "NetworkCallback.h"
    44 #include "SynchronisableVariable.h"
    4544
    4645/*#define REGISTERDATA(varname, ...) \

  • code/trunk/src/network/synchronisable/SynchronisableSpecialisations.cc

    r3084 r3214  
    2828 */
    2929
    30 #include "network/synchronisable/Synchronisable.h"
    3130#include <string>
     31#include "util/Math.h"
     32#include "Synchronisable.h"
     33#include "SynchronisableVariable.h"
    3234
    3335// ================ template spezialisation

  • code/trunk/src/network/synchronisable/SynchronisableVariable.cc

    r3084 r3214  
    2929#include "SynchronisableVariable.h"
    3030
    31 
    3231namespace orxonox{
    3332

  • code/trunk/src/network/synchronisable/SynchronisableVariable.h

    r3102 r3214  
    2828
    2929
    30 #ifndef _NETWORK_SYNCHRONISABLEVARIABLE__
    31 #define _NETWORK_SYNCHRONISABLEVARIABLE__
     30#ifndef _SynchronisableVariable_H__
     31#define _SynchronisableVariable_H__
    3232
    3333#include "network/NetworkPrereqs.h"
    3434
    35 #include <string>
    3635#include <cassert>
     36#include <cstring>
    3737#include "util/Serialise.h"
    38 #include "core/Core.h"
    39 #include "core/CoreIncludes.h"
    4038#include "core/GameMode.h"
    41 #include "network/synchronisable/NetworkCallback.h"
    4239#include "network/synchronisable/NetworkCallbackManager.h"
    4340
    … …  
    253250
    254251
    255 #endif
     252#endif /* _SynchronisableVariable_H__ */
Note: See TracChangeset for help on using the changeset viewer.