Merge with master

[lilypond.git] / lily / music-function-scheme.cc

diff --git a/lily/music-function-scheme.cc b/lily/music-function-scheme.cc
index 06e57f083b7f51326a7248bdd2b589d4e51a3d54..828929994a93515b22840709f5a5efdcda65d28c 100644 (file)
--- a/lily/music-function-scheme.cc
+++ b/lily/music-function-scheme.cc
@@ -11,8 +11,7 @@ LY_DEFINE (ly_music_function_extract, "ly:music-function-extract", 1, 0, 0,
           (SCM x),
           "Return the Scheme function inside @var{x}")
 {
-  SCM_ASSERT_TYPE(is_music_function (x), x, SCM_ARG1, __FUNCTION__,
-                 "music function");
+  LY_ASSERT_TYPE (is_music_function, x, 1);
   
   return SCM_CELL_OBJECT_1(x);
 }
@@ -24,7 +23,7 @@ LY_DEFINE (ly_make_music_function, "ly:make-music-function", 2, 0, 0,
           "Its arguments. @code{signature} is a list containing either "
           "@code{ly:music?} predicates or other type predicates.")
 {
-  SCM_ASSERT_TYPE(ly_is_procedure (func), func, SCM_ARG1, __FUNCTION__, "function");
+  LY_ASSERT_TYPE (ly_is_procedure, func, 1);
   return  make_music_function (signature, func);
 }