Issue 5125: Don't use SCM_CELL_WORD_1 internal

diff --git a/lily/duration.cc b/lily/duration.cc
index 0c6fa4dd5f55c89b5fe628276c04b47acc3f7cc4..880b22c46a3575d1fc37bf78943d45992ca1ba8b 100644 (file)
--- a/lily/duration.cc
+++ b/lily/duration.cc
@@ -152,8 +152,8 @@ Duration::print_smob (SCM port, scm_print_state *) const
 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_

diff --git a/lily/pitch.cc b/lily/pitch.cc
index 9e46bba70e6ff1d2360a66292427f312b4b5f5c8..ee03ac44d8db2e53a782e0732acb766e23b6914a 100644 (file)
--- a/lily/pitch.cc
+++ b/lily/pitch.cc
@@ -238,8 +238,8 @@ Pitch::print_smob (SCM port, scm_print_state *) const
 SCM
 Pitch::equal_p (SCM a, SCM b)
 {
-  Pitch *p = (Pitch *) SCM_CELL_WORD_1 (a);
-  Pitch *q = (Pitch *) SCM_CELL_WORD_1 (b);
+  Pitch *p = unsmob<Pitch> (a);
+  Pitch *q = unsmob<Pitch> (b);
 
   bool eq = p->notename_ == q->notename_
             && p->octave_ == q->octave_