Run grand replace for 2015.

[lilypond.git] / lily / include / duration.hh

diff --git a/lily/include/duration.hh b/lily/include/duration.hh
index 69ac4872b5f5902f6d1f2f3cbb80e7a54b2ac911..b752e329b8404daa2ff603f5d36197152d4eee68 100644 (file)
--- 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--2011 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 *);
+  static const char 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
-