slot_rep: Pass a slot_rep*, not notifiable*, to destroy().

murraycu · murraycu · commit 2f5d33724dd6 · 2016-04-28T12:47:05.000+02:00
To make it clearer exactly what callback signature is expected,
and what the type of the data is.
diff --git a/sigc++/functors/slot.h b/sigc++/functors/slot.h
@@ -85,7 +85,7 @@ struct typed_slot_rep : public slot_rep
   /** Detaches the stored functor from the other referred trackables and destroys it.
    * This does not destroy the base slot_rep object.
    */
-  static void destroy(notifiable* data)
+  static void destroy(slot_rep* data)
   {
     auto self_ = static_cast<self*>(data);
     self_->call_ = nullptr;
diff --git a/sigc++/functors/slot_base.h b/sigc++/functors/slot_base.h
@@ -68,7 +68,9 @@ struct SIGC_API slot_rep : public trackable
 
   using hook_dup = slot_rep* (*)(slot_rep*);
 
-  inline slot_rep(hook call__, notifiable::func_destroy_notify destroy__, hook_dup dup__) noexcept
+  using func_slot_rep_destroy_notify = void (*)(slot_rep* data);
+
+  inline slot_rep(hook call__, func_slot_rep_destroy_notify destroy__, hook_dup dup__) noexcept
     : call_(call__),
       cleanup_(nullptr),
       parent_(nullptr),
@@ -142,17 +144,17 @@ struct SIGC_API slot_rep : public trackable
   hook call_;
 
   /** Callback of parent_. */
-  func_destroy_notify cleanup_;
+  notifiable::func_destroy_notify cleanup_;
 
   /** Parent object whose callback cleanup_ is executed on notification. */
   notifiable* parent_;
 
 protected:
   /// Callback that detaches the slot_rep object from referred trackables and destroys it.
-  /* This could be a replaced by a virtual dtor. However since this struct is
-   * crucual for the efficiency of the whole library we want to avoid this.
+  /* This could be a replaced by a virtual dtor. However, since this struct is
+   * crucial for the efficiency of the whole library, we want to avoid this.
    */
-  func_destroy_notify destroy_;
+  func_slot_rep_destroy_notify destroy_;
 
 private:
   /** Callback that makes a deep copy of the slot_rep object.

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ struct typed_slot_rep : public slot_rep`
`85`	`85`	`/** Detaches the stored functor from the other referred trackables and destroys it.`
`86`	`86`	`* This does not destroy the base slot_rep object.`
`87`	`87`	`*/`
`88`		`- static void destroy(notifiable* data)`
	`88`	`+ static void destroy(slot_rep* data)`
`89`	`89`	`{`
`90`	`90`	`auto self_ = static_cast<self*>(data);`
`91`	`91`	`self_->call_ = nullptr;`