X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fmoment.hh;h=c29032f99dc6f56d32fc087b2dcecfaccda7fe16;hb=9ead371f45f0a0c98e86e8e32eb86ef75c3af5a4;hp=6a3922066eefe427a02cc74267857ef52c0363aa;hpb=76490755dae238028e919653057f231b25be3445;p=lilypond.git diff --git a/lily/include/moment.hh b/lily/include/moment.hh index 6a3922066e..c29032f99d 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--2011 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 * const 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 */ -