Changeset 9579 for code/branches/core6/src/libraries

Timestamp:

Mar 25, 2013, 11:39:50 PM (12 years ago)

Author:

landauf

Message:

cleaned up some includes

Location:

code/branches/core6/src/libraries/network

Files:

• WANDiscoverable.h (modified) (1 diff)
• WANDiscovery.h (modified) (1 diff)
• packet/Gamestate.cc (modified) (1 diff)
• synchronisable/Serialise.h (modified) (1 diff)
• synchronisable/Synchronisable.h (modified) (1 diff)

code/branches/core6/src/libraries/network/WANDiscoverable.h

@@ -31 +31 @@
 #include "NetworkPrereqs.h"
 #include "core/class/OrxonoxClass.h"
-#include "core/CoreIncludes.h"
 #include "MasterServerComm.h"
 

code/branches/core6/src/libraries/network/WANDiscovery.h

@@ -31 +31 @@
 #include "NetworkPrereqs.h"
 #include "packet/ServerInformation.h"
-#include "core/CoreIncludes.h"
 #include "core/config/Configurable.h"
 #include "core/config/ConfigValueIncludes.h"

code/branches/core6/src/libraries/network/packet/Gamestate.cc

@@ -33 +33 @@
 #include "util/Output.h"
 #include "util/OrxAssert.h"
+#include "core/CoreIncludes.h"
 #include "core/GameMode.h"
 #include "core/object/ObjectList.h"

code/branches/core6/src/libraries/network/synchronisable/Serialise.h

@@ -41 +41 @@
 #include "util/Serialise.h"
 #include "core/CorePrereqs.h"
-#include "core/CoreIncludes.h"
-#include "core/BaseObject.h" // remove this if circular dependencies in BaseObject/SmartPtr are fixed
-//#include "core/SmartPtr.h"
 
 namespace orxonox{

code/branches/core6/src/libraries/network/synchronisable/Synchronisable.h

@@ -40 +40 @@
 
 #include "util/mbool.h"
+#include "util/Output.h"
 #include "core/class/OrxonoxClass.h"
 #include "SynchronisableVariable.h"