X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fmoment.hh;h=d84a992b40e73eb6b649476ffb14481558f259d4;hb=91723da7360b372904979b2d572f3f941ebbc924;hp=1c5d8c4b453f96bd3f5b0601322004821bfadd50;hpb=bc95f4434f760d41191341ab4508b2064eb19025;p=lilypond.git diff --git a/lily/include/moment.hh b/lily/include/moment.hh index 1c5d8c4b45..d84a992b40 100644 --- a/lily/include/moment.hh +++ b/lily/include/moment.hh @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1999--2010 Han-Wen Nienhuys + Copyright (C) 1999--2015 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 @@ -27,10 +27,12 @@ Musical timing (Main-timing, grace-timing) with glue for Guilification; */ -class Moment +class Moment : public Simple_smob { - DECLARE_SIMPLE_SMOBS (Moment); public: + static SCM equal_p (SCM, SCM); + int print_smob (SCM, scm_print_state *) const; + static const char type_p_name_[]; Moment (); Moment (int m); @@ -64,11 +66,10 @@ public: IMPLEMENT_ARITHMETIC_OPERATOR (Moment, +); IMPLEMENT_ARITHMETIC_OPERATOR (Moment, -); -IMPLEMENT_ARITHMETIC_OPERATOR (Moment, /); +IMPLEMENT_ARITHMETIC_OPERATOR (Moment, / ); IMPLEMENT_ARITHMETIC_OPERATOR (Moment, *); -IMPLEMENT_ARITHMETIC_OPERATOR (Moment, %); +IMPLEMENT_ARITHMETIC_OPERATOR (Moment, % ); -DECLARE_UNSMOB (Moment, moment); int compare (Moment const &, Moment const &); INSTANTIATE_COMPARE (Moment const &, Moment::compare); @@ -81,4 +82,3 @@ ostream &operator << (ostream &, Moment const &); bool moment_less (SCM a, SCM b); #endif /* MOMENT_HH */ -