X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmoment.cc;h=9f3e8ed383837e3fb7059eebff437cac5423588a;hb=e52c5d72fc45e123c8574803ba52871e6fe8a596;hp=adcecff767140095dd22e5fbb5aa3d8a5453fdb5;hpb=5bbfc22fce036b9b69df5e420de93e11da23c05e;p=lilypond.git

diff --git a/lily/moment.cc b/lily/moment.cc
index adcecff767..9f3e8ed383 100644
--- a/lily/moment.cc
+++ b/lily/moment.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1999--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1999--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -43,24 +43,15 @@ Moment::Moment (Rational m)
   grace_part_ = Rational (0);
 }
 
-#include "ly-smobs.icc"
 
-IMPLEMENT_SIMPLE_SMOBS (Moment);
-IMPLEMENT_TYPE_P (Moment, "ly:moment?");
+const char Moment::type_p_name_[] = "ly:moment?";
 
-SCM
-Moment::mark_smob (SCM)
-{
-  return SCM_EOL;
-}
 
 int
-Moment::print_smob (SCM s, SCM port, scm_print_state *)
+Moment::print_smob (SCM port, scm_print_state *)
 {
-  Moment *r = (Moment *) SCM_CELL_WORD_1 (s);
-
   scm_puts ("#<Mom ", port);
-  string str = r->to_string ();
+  string str = to_string ();
   scm_puts ((char *)str.c_str (), port);
   scm_puts (">", port);
 
@@ -207,4 +198,3 @@ moment_less (SCM a, SCM b)
 {
   return *Moment::unsmob (a) < *Moment::unsmob (b);
 }
-