X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fengraver-scheme.cc;h=970aebde55159e80132fc884ed3614a8e019821b;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=5596a2f2f8b7702e8e779b0d6204825a0e5c54a5;hpb=f4abbfff5f0d985a457e15586dbcc3ae473b0dee;p=lilypond.git

diff --git a/lily/engraver-scheme.cc b/lily/engraver-scheme.cc
index 5596a2f2f8..970aebde55 100644
--- a/lily/engraver-scheme.cc
+++ b/lily/engraver-scheme.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -27,13 +27,12 @@ LY_DEFINE (ly_engraver_make_grob, "ly:engraver-make-grob",
            "  @var{cause} should either be another grob"
            " or a music event.")
 {
-  LY_ASSERT_TYPE (Engraver::unsmob, engraver, 1);
+  LY_ASSERT_SMOB (Engraver, engraver, 1);
   LY_ASSERT_TYPE (ly_is_symbol, grob_name, 2);
   LY_ASSERT_TYPE (ly_is_grob_cause, cause, 3);
 
-  Grob *g = Engraver::unsmob (engraver)->
+  Grob *g = unsmob<Engraver> (engraver)->
             internal_make_grob (grob_name, cause,
-                                ly_symbol2string (grob_name).c_str (),
                                 "scheme", 0, "scheme");
   return g->self_scm ();
 }
@@ -45,12 +44,12 @@ LY_DEFINE (ly_engraver_announce_end_grob, "ly:engraver-announce-end-grob",
            " @var{grob} being a grob.  @var{cause} should either"
            " be another grob or a music event.")
 {
-  LY_ASSERT_TYPE (Engraver::unsmob, engraver, 1);
+  LY_ASSERT_SMOB (Engraver, engraver, 1);
   LY_ASSERT_SMOB (Grob, grob, 2);
   LY_ASSERT_TYPE (ly_is_grob_cause, cause, 3);
 
-  Engraver::unsmob (engraver)->
-  announce_end_grob (Grob::unsmob (grob), cause);
+  unsmob<Engraver> (engraver)->
+  announce_end_grob (unsmob<Grob> (grob), cause);
 
   return SCM_UNSPECIFIED;
 }