Changeset 10407 for code/branches/core7/src/libraries/network

Timestamp:

Apr 27, 2015, 11:08:26 PM (10 years ago)

Author:

landauf

Message:

moved Scope and ScopedSingletonManager from util to core.
TODO I had to disable two tests in ScopeTest.cc because now that it runs in the core library, there are too many singletons which get loaded in graphics scope (with too many dependencies). this should be fixed

Location:

code/branches/core7/src/libraries/network

Files:

• Client.cc (modified) (2 diffs)
• LANDiscovery.cc (modified) (1 diff)
• MasterServer.cc (modified) (1 diff)

code/branches/core7/src/libraries/network/Client.cc

@@ -45 +45 @@
 #include "util/Clock.h"
 #include "util/Output.h"
-#include "util/ScopedSingletonManager.h"
 #include "synchronisable/Synchronisable.h"
 #include "packet/Chat.h"
@@ -53 +52 @@
 #include "core/Game.h"
 #include "core/commandline/CommandLineParser.h"
+#include "core/singleton/ScopedSingletonManager.h"
 
 namespace orxonox

code/branches/core7/src/libraries/network/LANDiscovery.cc

@@ -32 +32 @@
 #include <cstring>
 
-#include "util/ScopedSingletonManager.h"
 #include "core/CoreIncludes.h"
+#include "core/singleton/ScopedSingletonManager.h"
 
 

code/branches/core7/src/libraries/network/MasterServer.cc

@@ -28 +28 @@
 
 #include "MasterServer.h"
-#include "util/ScopedSingletonManager.h"
 #include "core/command/ConsoleCommandIncludes.h"
 #include "core/CoreIncludes.h"
 #include "core/CorePrereqs.h"
+#include "core/singleton/ScopedSingletonManager.h"
 #include "util/Output.h"