X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmoment.cc;h=e654eb3536fcdd2ad36cff1a125d64ab6269fa3f;hb=207f71b8b2ab9ca550e841615bedce393e652ca6;hp=9f3e8ed383837e3fb7059eebff437cac5423588a;hpb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;p=lilypond.git

diff --git a/lily/moment.cc b/lily/moment.cc
index 9f3e8ed383..e654eb3536 100644
--- a/lily/moment.cc
+++ b/lily/moment.cc
@@ -21,6 +21,8 @@
 
 #include "warn.hh"
 
+using std::string;
+
 Moment::Moment ()
 {
 }
@@ -48,7 +50,7 @@ const char 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 +73,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 +188,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 +198,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);
 }