X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fduration.cc;h=880b22c46a3575d1fc37bf78943d45992ca1ba8b;hb=90e4d7057f3857da049dfda3d130017d4719bd6b;hp=4768f015b501c6510f52b373fb4625d94f168889;hpb=d2762a4f1add2bb04d6fc34d3c7ae03eeb7d500f;p=lilypond.git

diff --git a/lily/duration.cc b/lily/duration.cc
index 4768f015b5..880b22c46a 100644
--- a/lily/duration.cc
+++ b/lily/duration.cc
@@ -136,11 +136,11 @@ Duration::to_string () const
   return s;
 }
 
-const char Duration::type_p_name_[] = "ly:duration?";
+const char * const Duration::type_p_name_ = "ly:duration?";
 
 
 int
-Duration::print_smob (SCM port, scm_print_state *)
+Duration::print_smob (SCM port, scm_print_state *) const
 {
   scm_puts ("#<Duration ", port);
   scm_display (ly_string2scm (to_string ()), port);
@@ -152,8 +152,8 @@ Duration::print_smob (SCM port, scm_print_state *)
 SCM
 Duration::equal_p (SCM a, SCM b)
 {
-  Duration *p = (Duration *) SCM_CELL_WORD_1 (a);
-  Duration *q = (Duration *) SCM_CELL_WORD_1 (b);
+  Duration *p = unsmob<Duration> (a);
+  Duration *q = unsmob<Duration> (b);
 
   bool eq = p->dots_ == q->dots_
             && p->durlog_ == q->durlog_