X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fcluster.cc;h=9c160fd8ccb4037aee24480a5581078e997208bd;hb=90e4d7057f3857da049dfda3d130017d4719bd6b;hp=03e4e1eb36426e50199682e04b1188f35ac55c25;hpb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;p=lilypond.git

diff --git a/lily/cluster.cc b/lily/cluster.cc
index 03e4e1eb36..9c160fd8cc 100644
--- a/lily/cluster.cc
+++ b/lily/cluster.cc
@@ -125,7 +125,7 @@ MAKE_SCHEME_CALLBACK (Cluster, calc_cross_staff, 1);
 SCM
 Cluster::calc_cross_staff (SCM smob)
 {
-  Grob *me = Grob::unsmob (smob);
+  Grob *me = unsmob<Grob> (smob);
 
   extract_grob_set (me, "columns", cols);
   Grob *commony = common_refpoint_of_array (cols, me, Y_AXIS);
@@ -137,7 +137,7 @@ MAKE_SCHEME_CALLBACK (Cluster, print, 1);
 SCM
 Cluster::print (SCM smob)
 {
-  Grob *me = Grob::unsmob (smob);
+  Grob *me = unsmob<Grob> (smob);
 
   Spanner *spanner = dynamic_cast<Spanner *> (me);
   if (!spanner)
@@ -228,14 +228,13 @@ struct Cluster_beacon
 {
 public:
   DECLARE_SCHEME_CALLBACK (height, (SCM));
-  DECLARE_GROB_INTERFACE ();
 };
 
 MAKE_SCHEME_CALLBACK (Cluster_beacon, height, 1);
 SCM
 Cluster_beacon::height (SCM g)
 {
-  Grob *me = Grob::unsmob (g);
+  Grob *me = unsmob<Grob> (g);
   Interval v = robust_scm2interval (me->get_property ("positions"),
                                     Interval (0, 0));
   return ly_interval2scm (Staff_symbol_referencer::staff_space (me) * 0.5 * v);