fixup! Callback updates

Author: kjbracey

platform/Callback.h

@@ -139,8 +139,8 @@ struct CallbackBase {
     // Dynamically dispatched operations
     const struct ops {
         void (*call)(); // type-erased function pointer
-        void (*copy)(CallbackBase *, const CallbackBase *);
-        void (*dtor)(CallbackBase *);
+        void (*copy)(store &, const store &);
+        void (*dtor)(store &);
     } *_ops;
 
     // Control
@@ -203,7 +203,7 @@ struct CallbackBase {
     {
         _ops = other._ops;
         if (_ops) {
-            _ops->copy(this, &other);
+            _ops->copy(_storage, other._storage);
         }
     }
 #else
@@ -220,37 +220,36 @@ struct CallbackBase {
     {
 #if MBED_CONF_PLATFORM_CALLBACK_NONTRIVIAL
         if (_ops) {
-            _ops->dtor(this);
+            _ops->dtor(_storage);
         }
 #endif
     }
 
 #if MBED_CONF_PLATFORM_CALLBACK_NONTRIVIAL
     // Copy construct F into storage
     template <typename F>
-    static void target_copy(CallbackBase *d, const CallbackBase *p)
+    static void target_copy(store &d, const store &p)
     {
-        const F &f = reinterpret_cast<const F &>(p->_storage);
-        new (&d->_storage) F(f);
+        const F &f = reinterpret_cast<const F &>(p);
+        new (&d) F(f);
     }
 
     // Destroy F in storage
     template <typename F>
-    static void target_dtor(CallbackBase *p)
+    static void target_dtor(store &p)
     {
         F &f = reinterpret_cast<F &>(p);
         f.~F();
     }
 
     // Trivial copy construction into storage
-    static void trivial_target_copy(CallbackBase *d, const CallbackBase *p) noexcept
+    static void trivial_target_copy(store &d, const store &p) noexcept
     {
-        //d->_storage = p->_storage;
-        std::memcpy(&d->_storage, &p->_storage, sizeof d->_storage);
+        std::memcpy(&d, &p, sizeof d);
     }
 
     // Trivial destruction in storage
-    static void trivial_target_dtor(CallbackBase *p) noexcept
+    static void trivial_target_dtor(store &p) noexcept
     {
     }
 #endif