X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspanner-scheme.cc;h=1d413439b455822828419d8a8ae11fefb314633e;hb=b872748c6aa8bb721ced458691b38ac2fac5dfc8;hp=f14c69c76f01763549cf0be8fa0ca9f6750886d9;hpb=9e781b7dc83b60a543ce218aa1a5f139f74c760f;p=lilypond.git

diff --git a/lily/spanner-scheme.cc b/lily/spanner-scheme.cc
index f14c69c76f..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
@@ -26,9 +26,9 @@ LY_DEFINE (ly_spanner_bound, "ly:spanner-bound",
            "Get one of the bounds of @var{spanner}.  @var{dir} is @w{@code{-1}}"
            " for left, and @code{1} for right.")
 {
-  LY_ASSERT_TYPE (unsmob_spanner, spanner, 1);
+  LY_ASSERT_SMOB (Spanner, spanner, 1);
   LY_ASSERT_TYPE (is_direction, dir, 2);
-  Item *bound = unsmob_spanner (spanner)->get_bound (to_dir (dir));
+  Item *bound = unsmob<Spanner> (spanner)->get_bound (to_dir (dir));
   return bound ? bound->self_scm () : SCM_EOL;
 }
 
@@ -37,11 +37,11 @@ LY_DEFINE (ly_spanner_set_bound_x, "ly:spanner-set-bound!",
            "Set grob @var{item} as bound in direction @var{dir} for"
            " @var{spanner}.")
 {
-  LY_ASSERT_TYPE (unsmob_spanner, spanner, 1);
+  LY_ASSERT_SMOB (Spanner, spanner, 1);
   LY_ASSERT_TYPE (is_direction, dir, 2);
-  LY_ASSERT_TYPE (unsmob_item, item, 3);
+  LY_ASSERT_SMOB (Item, item, 3);
 
-  unsmob_spanner (spanner)->set_bound (to_dir (dir), unsmob_item (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 (unsmob_spanner, spanner, 1);
-  Spanner *me = dynamic_cast<Spanner *> (unsmob_grob (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 = unsmob_grob (g);
+  Grob *me = unsmob<Grob> (g);
   bool b = dynamic_cast<Spanner *> (me);
 
   return ly_bool2scm (b);