Issue 4365: non-member unsmob<T> replaces T::unsmob and T::is_smob

[lilypond.git] / lily / include / listener.hh

diff --git a/lily/include/listener.hh b/lily/include/listener.hh
index d9f8aea76ee020a89084dc3b6f9d018a1494f220..6f8995c64e88d134406abab2a799c9b527a67e37 100644 (file)
--- a/lily/include/listener.hh
+++ b/lily/include/listener.hh
@@ -122,7 +122,7 @@ public:
 
   static SCM equal_p (SCM a, SCM b)
   {
-    return *Listener::unsmob (a) == *Listener::unsmob (b)
+    return *unchecked_unsmob (a) == *unchecked_unsmob (b)
       ? SCM_BOOL_T : SCM_BOOL_F;
   }
 };
@@ -157,8 +157,8 @@ class Callback_wrapper : public Simple_smob<Callback_wrapper>
   template <class T, void (T::*callback)(SCM)>
   static void trampoline (SCM target, SCM ev)
   {
-    T *t = derived_unsmob<T> (target);
-    LY_ASSERT_DERIVED_SMOB (T, target, 1);
+    T *t = unsmob<T> (target);
+    LY_ASSERT_SMOB (T, target, 1);
 
     (t->*callback) (ev);
   }
@@ -168,12 +168,12 @@ class Callback_wrapper : public Simple_smob<Callback_wrapper>
     // The same, but for callbacks for translator listeners which get
     // the unpacked event which, in turn, gets protected previously
 
-    T *t = derived_unsmob<T> (target);
-    LY_ASSERT_DERIVED_SMOB (T, target, 1);
+    T *t = unsmob<T> (target);
+    LY_ASSERT_SMOB (T, target, 1);
     LY_ASSERT_SMOB (Stream_event, event, 2);
 
     t->protect_event (event);
-    (t->*callback) (Stream_event::unsmob (event));
+    (t->*callback) (unsmob<Stream_event> (event));
   }
 
   Callback_wrapper (void (*trampoline) (SCM, SCM)) : trampoline_ (trampoline)