X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fduration.cc;h=4768f015b501c6510f52b373fb4625d94f168889;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=894748f915788a9387add5c8ad5fdeb39d31e9cb;hpb=82bc9ad690e201aaa55694f8b92261ae7338f56a;p=lilypond.git

diff --git a/lily/duration.cc b/lily/duration.cc
index 894748f915..4768f015b5 100644
--- a/lily/duration.cc
+++ b/lily/duration.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2014 Jan Nieuwenhuizen <janneke@gnu.org>
+  Copyright (C) 1997--2015 Jan Nieuwenhuizen <janneke@gnu.org>
   Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
@@ -23,7 +23,6 @@
 #include "misc.hh"
 #include "lily-proto.hh"
 
-#include "ly-smobs.icc"
 
 int
 Duration::compare (Duration const &left, Duration const &right)
@@ -137,22 +136,14 @@ Duration::to_string () const
   return s;
 }
 
-IMPLEMENT_TYPE_P (Duration, "ly:duration?");
+const char Duration::type_p_name_[] = "ly:duration?";
 
-SCM
-Duration::mark_smob (SCM)
-{
-  return SCM_EOL;
-}
 
-IMPLEMENT_SIMPLE_SMOBS (Duration);
 int
-Duration::print_smob (SCM s, SCM port, scm_print_state *)
+Duration::print_smob (SCM port, scm_print_state *)
 {
-  Duration *r = (Duration *) SCM_CELL_WORD_1 (s);
-
   scm_puts ("#<Duration ", port);
-  scm_display (ly_string2scm (r->to_string ()), port);
+  scm_display (ly_string2scm (to_string ()), port);
   scm_puts (" >", port);
 
   return 1;