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

Timestamp:

Jun 6, 2015, 11:52:25 PM (10 years ago)

Author:

landauf

Message:

statically initialized instances are now registered with a type. CoreStaticInitializationHandler initializes all instances in core, NetworkStaticInitializationHandler initializes all instances in network.

Location:

code/branches/core7/src/libraries/network

Files:

• CMakeLists.txt (modified) (1 diff)
• NetworkFunctionIncludes.cc (modified) (1 diff)
• NetworkFunctionIncludes.h (modified) (1 diff)
• NetworkPrereqs.h (modified) (1 diff)
• NetworkStaticInitializationHandler.cc (added)
• NetworkStaticInitializationHandler.h (added)

code/branches/core7/src/libraries/network/CMakeLists.txt

@@ -36 +36 @@
   NetworkFunctionIncludes.cc
   NetworkFunctionManager.cc
+  NetworkStaticInitializationHandler.cc
   Host.cc
   Server.cc

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

@@ -30 +30 @@
 #include "NetworkFunctionManager.h"
 
+#include "core/module/StaticInitializationHandlerIncludes.h"
+#include "NetworkStaticInitializationHandler.h"
+
 namespace orxonox
 {
+    RegisterStaticInitializationHandler(NetworkStaticInitializationHandler);
+
     void StaticallyInitializedNetworkFunction::load()
     {

code/branches/core7/src/libraries/network/NetworkFunctionIncludes.h

@@ -52 +52 @@
         public:
             StaticallyInitializedNetworkFunction(NetworkFunctionBase* function)
-                : StaticallyInitializedInstance(0)
+                : StaticallyInitializedInstance(StaticInitialization::NETWORK_FUNCTION)
                 , function_(function)
             {}

code/branches/core7/src/libraries/network/NetworkPrereqs.h

@@ -97 +97 @@
     }
   }
+
+  namespace StaticInitialization
+  {
+    typedef int Type;
+    static const Type NETWORK_FUNCTION = 6;
+  }
 }