X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fengraver.cc;h=23d7fd9fc2701b0f795d024b70326d44c164dc21;hb=37cfad99ea310993f6c3012330d0b56c390cd146;hp=76e1ef6f58b8214419cd9b422369480a8ace2fa4;hpb=a4cc910a3401d25bb94ff0ecb4dc18f681c71004;p=lilypond.git

diff --git a/lily/engraver.cc b/lily/engraver.cc
index 76e1ef6f58..23d7fd9fc2 100644
--- a/lily/engraver.cc
+++ b/lily/engraver.cc
@@ -52,12 +52,12 @@ Grob_info
 Engraver::make_grob_info (Grob *e, SCM cause)
 {
   /* TODO: Remove Music code when it's no longer needed */
-  if (Music *m = Music::unsmob (cause))
+  if (Music *m = unsmob<Music> (cause))
     {
       cause = m->to_event ()->unprotect ();
     }
   if (scm_is_null (e->get_property ("cause"))
-      && (Stream_event::is_smob (cause) || Grob::is_smob (cause)))
+      && (unsmob<Stream_event> (cause) || unsmob<Grob> (cause)))
     e->set_property ("cause", cause);
 
   return Grob_info (this, e);
@@ -174,7 +174,7 @@ Engraver::internal_make_spanner (SCM x, SCM cause, char const *name,
 bool
 ly_is_grob_cause (SCM obj)
 {
-  return Grob::is_smob (obj) || Stream_event::is_smob (obj) || scm_is_null (obj);
+  return unsmob<Grob> (obj) || unsmob<Stream_event> (obj) || scm_is_null (obj);
 }
 
 #include "translator.icc"