Changeset 10478 for code/branches/core7/src/libraries/network/packet

Timestamp:

May 25, 2015, 5:37:15 PM (10 years ago)

Author:

landauf

Message:

callStaticNetworkFunction() and callMemberNetworkFunction() are now template functions instead of macros.
simplified function call interface: always pass five MultiType-references. Check if MultiType.null() evaluates to true to see if the argument was defined.
moved references to NetworkFunctionManager to NetworkFunctionIncludes.cc.
this also fixed a linker error in MSVC by including NetworkFunctionIncludes.h in a build-unit inside the network library.

Location:

code/branches/core7/src/libraries/network/packet

Files:

• FunctionCalls.cc (modified) (1 diff)
• FunctionCalls.h (modified) (1 diff)

code/branches/core7/src/libraries/network/packet/FunctionCalls.cc

@@ -82 +82 @@
 }
 
-void FunctionCalls::addCall( uint32_t networkID, uint32_t objectID, const MultiType* mt1, const MultiType* mt2, const MultiType* mt3, const MultiType* mt4, const MultiType* mt5)
+void FunctionCalls::addCall( uint32_t networkID, uint32_t objectID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3, const MultiType& mt4, const MultiType& mt5)
 {
   assert(!isDataENetAllocated());

code/branches/core7/src/libraries/network/packet/FunctionCalls.h

@@ -56 +56 @@
   virtual bool process(orxonox::Host* host);
 
-  void addCall( uint32_t networkID, uint32_t objectID, const MultiType* mt1=0, const MultiType* mt2=0, const MultiType* mt3=0, const MultiType* mt4=0, const MultiType* mt5=0);
+  void addCall( uint32_t networkID, uint32_t objectID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3, const MultiType& mt4, const MultiType& mt5);
   virtual bool send(orxonox::Host* host);
 private: