X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpitch.cc;h=ee03ac44d8db2e53a782e0732acb766e23b6914a;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=4c5cb79e37620dfd4f347adc36c98b8f4888ebcb;hpb=90d3233da87b372e02690978f89b2add3863fba6;p=lilypond.git

diff --git a/lily/pitch.cc b/lily/pitch.cc
index 4c5cb79e37..ee03ac44d8 100644
--- a/lily/pitch.cc
+++ b/lily/pitch.cc
@@ -26,8 +26,6 @@
 
 #include <cmath>
 
-ADD_SMOB_INIT (Pitch);
-
 Pitch::Pitch (int o, int n, Rational a)
 {
   notename_ = n;
@@ -220,16 +218,16 @@ Pitch::down_to (int notename)
   notename_ = notename;
 }
 
-const char Pitch::type_p_name_[] = "ly:pitch?";
+const char * const Pitch::type_p_name_ = "ly:pitch?";
 
 SCM
-Pitch::mark_smob ()
+Pitch::mark_smob () const
 {
   return scale_->self_scm ();
 }
 
 int
-Pitch::print_smob (SCM port, scm_print_state *)
+Pitch::print_smob (SCM port, scm_print_state *) const
 {
   scm_puts ("#<Pitch ", port);
   scm_display (ly_string2scm (to_string ()), port);
@@ -240,8 +238,8 @@ Pitch::print_smob (SCM port, scm_print_state *)
 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_
@@ -254,8 +252,8 @@ MAKE_SCHEME_CALLBACK (Pitch, less_p, 2);
 SCM
 Pitch::less_p (SCM p1, SCM p2)
 {
-  Pitch *a = Pitch::unsmob (p1);
-  Pitch *b = Pitch::unsmob (p2);
+  Pitch *a = unsmob<Pitch> (p1);
+  Pitch *b = unsmob<Pitch> (p2);
 
   if (compare (*a, *b) < 0)
     return SCM_BOOL_T;