Merge branch 'master' of /home/jcharles/GIT/Lily/. into translation

[lilypond.git] / lily / include / music-function.hh

diff --git a/lily/include/music-function.hh b/lily/include/music-function.hh
index 99c6c8f157460523d155181d5051a330a5a42b92..80239a61aaefe202f8282c78f453564a55b31b36 100644 (file)
--- a/lily/include/music-function.hh
+++ b/lily/include/music-function.hh
@@ -27,11 +27,12 @@
 class Music_function : public Smob2<Music_function>
 {
 public:
-  static const char type_p_name_[];
-  SCM mark_smob ();
-  int print_smob (SCM, scm_print_state *);
-  SCM get_signature () { return scm1 (); }
-  SCM get_function () { return scm2 (); }
+  static const char * const type_p_name_;
+  int print_smob (SCM, scm_print_state *) const;
+  SCM get_signature () const { return scm1 (); }
+  SCM get_function () const { return scm2 (); }
+  SCM call (SCM args);
+  LY_DECLARE_SMOB_PROC (&Music_function::call, 0, 0, 1);
 };
 
 #endif /* MUSIC_FUNCTION_HH */