Changeset 10471 for code/branches/core7/src/libraries/network/NetworkFunctionIncludes.h

Timestamp:

May 25, 2015, 1:37:50 PM (9 years ago)

Author:

landauf

Message:

moved static maps from NetworkFunctionStatic and NetworkMemberFunctionBase to NetworkFunctionManager

File:

• code/branches/core7/src/libraries/network/NetworkFunctionIncludes.h (modified) (3 diffs)

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

@@ -36 +36 @@
 
 #include "NetworkFunction.h"
+#include "NetworkFunctionManager.h"
 
 namespace orxonox
@@ -50 +51 @@
             NetworkFunctionPointer p1; \
             copyPtr( functionPointer, p1 ); \
-            FunctionCallManager::addCallStatic(NetworkFunctionStatic::getFunction(p1)->getNetworkID(), __VA_ARGS__); \
+            FunctionCallManager::addCallStatic(NetworkFunctionManager::getFunction(p1)->getNetworkID(), __VA_ARGS__); \
         }
 
@@ -58 +59 @@
             NetworkFunctionPointer p1; \
             copyPtr( &class::function, p1 ); \
-            FunctionCallManager::addCallMember(NetworkMemberFunctionBase::getFunction(p1)->getNetworkID(), objectID, __VA_ARGS__); \
+            FunctionCallManager::addCallMember(NetworkFunctionManager::getFunction(p1)->getNetworkID(), objectID, __VA_ARGS__); \
         }