Changeset 2943 for code/branches/netp2

Timestamp:

Apr 30, 2009, 2:54:44 PM (16 years ago)

Author:

scheusso

Message:

fixed a problem with copying function pointers

File:

• code/branches/netp2/src/network/NetworkFunction.h (modified) (4 diffs)

code/branches/netp2/src/network/NetworkFunction.h

@@ -67 +67 @@
 
 
-class NetworkFunctionBase: virtual public OrxonoxClass {
+class _NetworkExport NetworkFunctionBase: virtual public OrxonoxClass {
   public:
     NetworkFunctionBase(std::string name);
@@ -156 +156 @@
 template<class T> inline void copyPtr( T ptr, NetworkFunctionPointer& destptr)
 {
-  memset(&destptr, 0, sizeof(ptr));
+  memset((uint8_t*)&destptr + sizeof(T), 0, sizeof(NetworkFunctionPointer)-sizeof(T));
   T p2 = ptr;
   memcpy( &destptr, &p2, sizeof(T) );
@@ -167 +167 @@
   NetworkFunctionPointer destptr;
   copyPtr( ptr, destptr );
+  COUT(0) << "-==================== destptr: " << destptr.pointer[0] << ", " << destptr.pointer[1] << endl;
   new NetworkFunctionStatic( createFunctor(ptr), name, destptr );
   return 0;
@@ -187 +188 @@
     NetworkFunctionPointer p1; \
     copyPtr( functionPointer, p1 ); \
-    FunctionCallManager::addCallStatic(NetworkMemberFunctionBase::getFunction(p1)->getNetworkID(), __VA_ARGS__); \
+    FunctionCallManager::addCallStatic(NetworkFunctionStatic::getFunction(p1)->getNetworkID(), __VA_ARGS__); \
   }
 #define callMemberNetworkFunction( functionPointer, objectID, ...) \