X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic-function.cc;h=65fedab7ddd70380457a9fa1304176589749eb69;hb=3d456562eb14c3dc8515038a25a2dde24b2486b8;hp=85b21575761961e209a76811fae4506297940463;hpb=c324981f1598c00059ce42e3226cc2ad078a6db2;p=lilypond.git diff --git a/lily/music-function.cc b/lily/music-function.cc index 85b2157576..65fedab7dd 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--2012 Han-Wen Nienhuys + Copyright (C) 2004--2014 Han-Wen Nienhuys LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -22,13 +22,14 @@ #include "music.hh" #include "ly-smobs.icc" -class Musicfunction { +class Musicfunction +{ DECLARE_SIMPLE_SMOBS (Musicfunction); SCM signature_; SCM function_; public: Musicfunction (SCM signature, SCM function): - signature_(signature), function_(function) { } + signature_ (signature), function_ (function) { } SCM get_function () { return function_; } SCM get_signature () { return signature_; } }; @@ -83,6 +84,6 @@ Musicfunction::mark_smob (SCM s) { Musicfunction *p = Musicfunction::unsmob (s); scm_gc_mark (p->signature_); - ASSERT_LIVE_IS_ALLOWED (); + ASSERT_LIVE_IS_ALLOWED (s); return p->function_; }