X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fduration.hh;h=6233fc1b2d4fdff1c897cc33c040e8145fbf457e;hb=9731b3d4f9eb2435451dc91124a02ea79ced1b29;hp=a7efb98eab5647bffb6502aeeb10328a0518f3f8;hpb=d61cf3bbdb1c6670a127ba3baddf2f04d3e34fd3;p=lilypond.git

diff --git a/lily/include/duration.hh b/lily/include/duration.hh
index a7efb98eab..6233fc1b2d 100644
--- a/lily/include/duration.hh
+++ b/lily/include/duration.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2012 Jan Nieuwenhuizen <janneke@gnu.org>
+  Copyright (C) 1997--2015 Jan Nieuwenhuizen <janneke@gnu.org>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -25,10 +25,11 @@
 /**
    A musical duration.
 */
-struct Duration
+struct Duration : public Simple_smob<Duration>
 {
-public:
-
+  static SCM equal_p (SCM, SCM);
+  int print_smob (SCM, scm_print_state *) const;
+  static const char * const type_p_name_;
   Duration ();
   Duration (int, int);
   Duration (Rational, bool scale);
@@ -43,7 +44,6 @@ public:
   static int compare (Duration const &, Duration const &);
 
   DECLARE_SCHEME_CALLBACK (less_p, (SCM a, SCM b));
-  DECLARE_SIMPLE_SMOBS (Duration);
 
 private:
   /// Logarithm of the base duration.
@@ -54,9 +54,7 @@ private:
 };
 
 INSTANTIATE_COMPARE (Duration, Duration::compare);
-DECLARE_UNSMOB (Duration, duration);
 
 extern SCM Duration_type_p_proc;
 
 #endif // DURATION_HH
-