Diff: ble/FunctionPointerWithContext.h

Revision:

890:f3144091ae19

Parent:

886:0a45c67b2301

Child:

897:838e1375dbaa

--- a/ble/FunctionPointerWithContext.h	Thu Nov 26 12:52:00 2015 +0000
+++ b/ble/FunctionPointerWithContext.h	Thu Nov 26 12:52:00 2015 +0000
@@ -19,6 +19,7 @@
 
 #include <string.h>
 
+
 /** A class for storing and calling a pointer to a static or member void function
  *  which takes a context.
  */
@@ -33,7 +34,7 @@
      *  @param function The void static function to attach (default is none)
      */
     FunctionPointerWithContext(void (*function)(ContextType context) = NULL) :
-        _function(NULL), _caller(NULL), _next(NULL) {
+        _function(NULL), _object(NULL), _member(), _membercaller(NULL), _next(NULL) {
         attach(function);
     }
 
@@ -44,7 +45,7 @@
      */
     template<typename T>
     FunctionPointerWithContext(T *object, void (T::*member)(ContextType context)) :
-        _memberFunctionAndPointer(), _caller(NULL), _next(NULL) {
+        _function(NULL), _object(NULL), _member(), _membercaller(NULL), _next(NULL) {
         attach(object, member);
     }
 
@@ -54,7 +55,6 @@
      */
     void attach(void (*function)(ContextType context) = NULL) {
         _function = function;
-        _caller = functioncaller;
     }
 
     /** Attach a member function
@@ -64,9 +64,9 @@
      */
     template<typename T>
     void attach(T *object, void (T::*member)(ContextType context)) {
-        _memberFunctionAndPointer._object = static_cast<void *>(object);
-        memcpy(_memberFunctionAndPointer._memberFunction, (char*) &member, sizeof(member));
-        _caller = &FunctionPointerWithContext::membercaller<T>;
+        _object = static_cast<void *>(object);
+        memcpy(_member, (char *)&member, sizeof(member));
+        _membercaller = &FunctionPointerWithContext::membercaller<T>;
     }
 
     /** Call the attached static or member function; and if there are chained
@@ -74,7 +74,11 @@
      *  @Note: all chained callbacks stack up; so hopefully there won't be too
      *  many FunctionPointers in a chain. */
     void call(ContextType context) {
-        _caller(this, context);
+        if (_function) {
+            _function(context);
+        } else if (_object && _membercaller) {
+            _membercaller(_object, _member, context);
+        }
 
         /* Propagate the call to next in the chain. */
         if (_next) {
@@ -103,49 +107,19 @@
 
 private:
     template<typename T>
-    static void membercaller(pFunctionPointerWithContext_t self, ContextType context) {
-        if (self->_memberFunctionAndPointer._object) {
-            T *o = static_cast<T *>(self->_memberFunctionAndPointer._object);
-            void (T::*m)(ContextType);
-            memcpy((char*) &m, self->_memberFunctionAndPointer._memberFunction, sizeof(m));
-            (o->*m)(context);
-        }
-    }
-
-    static void functioncaller(pFunctionPointerWithContext_t self, ContextType context) {
-        if (self->_function) {
-            self->_function(context);
-        }
+    static void membercaller(void *object, char *member, ContextType context) {
+        T *o = static_cast<T *>(object);
+        void (T::*m)(ContextType);
+        memcpy((char *)&m, member, sizeof(m));
+        (o->*m)(context);
     }
 
-    struct MemberFunctionAndPtr {
-        /*
-         * forward declaration of a class and a member function to this class.
-         * Because the compiler doesn't know anything about the forwarded member
-         * function, it will always use the biggest size and the biggest alignment
-         * that a member function can take for objects of type UndefinedMemberFunction.
-         */
-        class UndefinedClass;
-        typedef void (UndefinedClass::*UndefinedMemberFunction)(ContextType);
-
-        void* _object;
-        union {
-            char _memberFunction[sizeof(UndefinedMemberFunction)];
-            UndefinedMemberFunction _alignment;
-        };
-    };
-
-    union {
-        pvoidfcontext_t _function;                      /**< static function pointer - NULL if none attached */
-        /**
-         * object this pointer and pointer to member -
-         * _memberFunctionAndPointer._object will be NULL if none attached
-         */
-        MemberFunctionAndPtr _memberFunctionAndPointer;
-    };
-
-    void (*_caller)(FunctionPointerWithContext*, ContextType);
-
+    void (*_function)(ContextType context);             /**< static function pointer - NULL if none attached */
+    void *_object;                                      /**< object this pointer - NULL if none attached */
+    char _member[16];                                   /**< raw member function pointer storage - converted back by
+                                                         *   registered _membercaller */
+    void (*_membercaller)(void *, char *, ContextType); /**< registered membercaller function to convert back and call
+                                                         *   _member on _object passing the context. */
     pFunctionPointerWithContext_t _next;                /**< Optional link to make a chain out of functionPointers; this
                                                          *   allows chaining function pointers without requiring
                                                          *   external memory to manage the chain. Also refer to