Merge with master

[lilypond.git] / lily / spanner-scheme.cc

diff --git a/lily/spanner-scheme.cc b/lily/spanner-scheme.cc
index c9bb9e37ab22d86505b36b4580af8b4a22a6fa1f..ec70ba6817b6e9bab5a4a9d51bd6c3f548eb2f1d 100644 (file)
--- a/lily/spanner-scheme.cc
+++ b/lily/spanner-scheme.cc
@@ -15,8 +15,8 @@ LY_DEFINE (ly_spanner_bound, "ly:spanner-bound",
           "Get one of the bounds of @var{spanner}. @var{dir} is @code{-1} "
           "for left, and @code{1} for right.")
 {
-  LY_ASSERT_FIRST_TYPE (unsmob_spanner, slur);
-  LY_ASSERT_TYPE(is_direction, 2);
+  LY_ASSERT_TYPE (unsmob_spanner, slur, 1);
+  LY_ASSERT_TYPE(is_direction, dir,2);
   
   return unsmob_spanner (slur)->get_bound (to_dir (dir))->self_scm ();
 }
@@ -27,7 +27,7 @@ LY_DEFINE (ly_spanner_broken_into, "ly:spanner-broken-into",
           1, 0, 0, (SCM spanner),
           "Return broken-into list for @var{spanner}.")
 {
-  SCM_ASSERT_FIRST_TYPE (unsmob_spanner, spanner);
+  LY_ASSERT_TYPE (unsmob_spanner, spanner, 1);
   Spanner *me = dynamic_cast<Spanner *> (unsmob_grob (spanner));
 
   SCM s = SCM_EOL;