X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic-function.cc;h=c485a2989c7b47738f5507931ad43153420c4b39;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=743b7f6767df339619fae1c23aec02dad290cef2;hpb=38a54ac8cf2367aa36f649379dbaec3566216e1c;p=lilypond.git

diff --git a/lily/music-function.cc b/lily/music-function.cc
index 743b7f6767..c485a2989c 100644
--- a/lily/music-function.cc
+++ b/lily/music-function.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2004--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2004--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -23,10 +23,10 @@ const char Music_function::type_p_name_[] = "ly:music-function?";
 
 /* Print a textual represenation of the smob to a given port.  */
 int
-Music_function::print_smob (SCM b, SCM port, scm_print_state *)
+Music_function::print_smob (SCM port, scm_print_state *)
 {
   scm_puts ("#<Music function ", port);
-  scm_write (Music_function::unsmob (b)->get_function (), port);
+  scm_write (get_function (), port);
   scm_puts (">", port);
 
   /* Non-zero means success.  */
@@ -34,8 +34,8 @@ Music_function::print_smob (SCM b, SCM port, scm_print_state *)
 }
 
 SCM
-Music_function::mark_smob (SCM s)
+Music_function::mark_smob ()
 {
-  ASSERT_LIVE_IS_ALLOWED (s);
-  return Smob2<Music_function>::mark_smob (s);
+  ASSERT_LIVE_IS_ALLOWED (self_scm ());
+  return Smob2<Music_function>::mark_smob ();
 }