X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmoment.cc;h=20c1f58a0b51cdef2e0c5e42e16c4dced7014e7d;hb=750b714488c5af6eae22d07163bba8b554734ac6;hp=9f3e8ed383837e3fb7059eebff437cac5423588a;hpb=d2762a4f1add2bb04d6fc34d3c7ae03eeb7d500f;p=lilypond.git

diff --git a/lily/moment.cc b/lily/moment.cc
index 9f3e8ed383..20c1f58a0b 100644
--- a/lily/moment.cc
+++ b/lily/moment.cc
@@ -44,11 +44,11 @@ Moment::Moment (Rational m)
 }
 
 
-const char Moment::type_p_name_[] = "ly:moment?";
+const char * const Moment::type_p_name_ = "ly:moment?";
 
 
 int
-Moment::print_smob (SCM port, scm_print_state *)
+Moment::print_smob (SCM port, scm_print_state *) const
 {
   scm_puts ("#<Mom ", port);
   string str = to_string ();
@@ -71,8 +71,8 @@ Moment::as_scheme () const
 SCM
 Moment::equal_p (SCM a, SCM b)
 {
-  Moment *m1 = Moment::unsmob (a);
-  Moment *m2 = Moment::unsmob (b);
+  Moment *m1 = unsmob<Moment> (a);
+  Moment *m2 = unsmob<Moment> (b);
 
   return (*m1 == *m2) ? SCM_BOOL_T : SCM_BOOL_F;
 }
@@ -186,7 +186,7 @@ operator << (ostream &os, Moment const &m)
 Moment
 robust_scm2moment (SCM m, Moment d)
 {
-  Moment *p = Moment::unsmob (m);
+  Moment *p = unsmob<Moment> (m);
   if (!p)
     return d;
   else
@@ -196,5 +196,5 @@ robust_scm2moment (SCM m, Moment d)
 bool
 moment_less (SCM a, SCM b)
 {
-  return *Moment::unsmob (a) < *Moment::unsmob (b);
+  return *unsmob<Moment> (a) < *unsmob<Moment> (b);
 }