Changeset 3209 for code/branches/netp5/src/network/synchronisable

Timestamp:

Jun 23, 2009, 2:12:44 AM (16 years ago)

Author:

rgrieder

Message:

Cleanup in network plus a few dependency reductions (no enet-function inlines, using enum PacketFlag instead of the enet version)

Location:

code/branches/netp5/src/network/synchronisable

Files:

• NetworkCallback.h (modified) (2 diffs)
• NetworkCallbackManager.cc (modified) (1 diff)
• NetworkCallbackManager.h (modified) (2 diffs)
• Synchronisable.cc (modified) (1 diff)
• Synchronisable.h (modified) (1 diff)
• SynchronisableSpecialisations.cc (modified) (1 diff)
• SynchronisableVariable.cc (modified) (1 diff)
• SynchronisableVariable.h (modified) (2 diffs)

code/branches/netp5/src/network/synchronisable/NetworkCallback.h

@@ -28 +28 @@
 
 
-#ifndef _NETWORK_CALLBACK__
-#define _NETWORK_CALLBACK__
+#ifndef _NetworkCallback_H__
+#define _NetworkCallback_H__
 
 #include "network/NetworkPrereqs.h"
@@ -61 +61 @@
 
 
-#endif
+#endif /* _NetworkCallback_H__ */

code/branches/netp5/src/network/synchronisable/NetworkCallbackManager.cc

@@ -27 +27 @@
  */
  
-
 #include "NetworkCallbackManager.h"
 #include "NetworkCallback.h"

code/branches/netp5/src/network/synchronisable/NetworkCallbackManager.h

@@ -28 +28 @@
 
 
-#ifndef _NETWORK_CALLBACKMANAGER__
-#define _NETWORK_CALLBACKMANAGER__
+#ifndef _NetworkCallbackManager_H__
+#define _NetworkCallbackManager_H__
 
 #include "network/NetworkPrereqs.h"
+
 #include <set>
 #include <queue>
@@ -52 +53 @@
 
 
-#endif
+#endif /* _NetworkCallbackManager_H__ */

code/branches/netp5/src/network/synchronisable/Synchronisable.cc

@@ -31 +31 @@
 #include "Synchronisable.h"
 
-#include <cstring>
-#include <string>
-#include <iostream>
-#include <cassert>
-
 #include "core/CoreIncludes.h"
 #include "core/BaseObject.h"
-// #include "core/Identifier.h"
-
 #include "network/Host.h"
+
 namespace orxonox
 {

code/branches/netp5/src/network/synchronisable/Synchronisable.h

@@ -32 +32 @@
 #include "network/NetworkPrereqs.h"
 
-#include <list>
+#include <cassert>
 #include <vector>
 #include <map>
 #include <queue>
-#include <cassert>
-#include <string>
-#include "util/Math.h"
+
 #include "util/mbool.h"
 #include "core/OrxonoxClass.h"
+#include "SynchronisableVariable.h"
 #include "NetworkCallback.h"
-#include "SynchronisableVariable.h"
 
 /*#define REGISTERDATA(varname, ...) \

code/branches/netp5/src/network/synchronisable/SynchronisableSpecialisations.cc

@@ -28 +28 @@
  */
 
-#include "network/synchronisable/Synchronisable.h"
 #include <string>
+#include "util/Math.h"
+#include "Synchronisable.h"
+#include "SynchronisableVariable.h"
 
 // ================ template spezialisation

code/branches/netp5/src/network/synchronisable/SynchronisableVariable.cc

@@ -29 +29 @@
 #include "SynchronisableVariable.h"
 
-
 namespace orxonox{
 

code/branches/netp5/src/network/synchronisable/SynchronisableVariable.h

@@ -28 +28 @@
 
 
-#ifndef _NETWORK_SYNCHRONISABLEVARIABLE__
-#define _NETWORK_SYNCHRONISABLEVARIABLE__
+#ifndef _SynchronisableVariable_H__
+#define _SynchronisableVariable_H__
 
 #include "network/NetworkPrereqs.h"
 
-#include <string>
 #include <cassert>
 #include "util/Serialise.h"
-#include "core/Core.h"
-#include "core/CoreIncludes.h"
 #include "core/GameMode.h"
-#include "network/synchronisable/NetworkCallback.h"
 #include "network/synchronisable/NetworkCallbackManager.h"
 
@@ -253 +249 @@
 
 
-#endif
+#endif /* _SynchronisableVariable_H__ */