X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspanner-scheme.cc;h=1d413439b455822828419d8a8ae11fefb314633e;hb=96cdc755b547688c46097ba6a155aa1085ea7ac4;hp=cee8c535f0730056389ff4515fd67a3a064a63cf;hpb=f5e923a6ce8cebb7ef893c03ce56aa5e598002c9;p=lilypond.git

diff --git a/lily/spanner-scheme.cc b/lily/spanner-scheme.cc
index cee8c535f0..1d413439b4 100644
--- a/lily/spanner-scheme.cc
+++ b/lily/spanner-scheme.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2007--2014 Han-Wen Nienhuys <hanwen@lilypond.org>
+  Copyright (C) 2007--2015 Han-Wen Nienhuys <hanwen@lilypond.org>
 
 
   LilyPond is free software: you can redistribute it and/or modify
@@ -28,7 +28,7 @@ LY_DEFINE (ly_spanner_bound, "ly:spanner-bound",
 {
   LY_ASSERT_SMOB (Spanner, spanner, 1);
   LY_ASSERT_TYPE (is_direction, dir, 2);
-  Item *bound = Spanner::unsmob (spanner)->get_bound (to_dir (dir));
+  Item *bound = unsmob<Spanner> (spanner)->get_bound (to_dir (dir));
   return bound ? bound->self_scm () : SCM_EOL;
 }
 
@@ -41,7 +41,7 @@ LY_DEFINE (ly_spanner_set_bound_x, "ly:spanner-set-bound!",
   LY_ASSERT_TYPE (is_direction, dir, 2);
   LY_ASSERT_SMOB (Item, item, 3);
 
-  Spanner::unsmob (spanner)->set_bound (to_dir (dir), Item::unsmob (item));
+  unsmob<Spanner> (spanner)->set_bound (to_dir (dir), unsmob<Item> (item));
   return SCM_UNSPECIFIED;
 }
 
@@ -51,8 +51,8 @@ LY_DEFINE (ly_spanner_broken_into, "ly:spanner-broken-into",
            1, 0, 0, (SCM spanner),
            "Return broken-into list for @var{spanner}.")
 {
-  LY_ASSERT_TYPE (Spanner::unsmob, spanner, 1);
-  Spanner *me = dynamic_cast<Spanner *> (Grob::unsmob (spanner));
+  LY_ASSERT_TYPE (unsmob<Spanner>, spanner, 1);
+  Spanner *me = unsmob<Spanner> (spanner);
 
   SCM s = SCM_EOL;
   for (vsize i = me->broken_intos_.size (); i--;)
@@ -64,7 +64,7 @@ LY_DEFINE (ly_spanner_p, "ly:spanner?",
            1, 0, 0, (SCM g),
            "Is @var{g} a spanner object?")
 {
-  Grob *me = Grob::unsmob (g);
+  Grob *me = unsmob<Grob> (g);
   bool b = dynamic_cast<Spanner *> (me);
 
   return ly_bool2scm (b);