Issue 5167/6: Changes: show \markup xxx = ... \etc assignments

[lilypond.git] / lily / pitch.cc

diff --git a/lily/pitch.cc b/lily/pitch.cc
index 0fd75129476a7a1d889d751c504e290f22c30843..ee03ac44d8db2e53a782e0732acb766e23b6914a 100644 (file)
--- a/lily/pitch.cc
+++ b/lily/pitch.cc
@@ -218,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);
@@ -238,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_
@@ -252,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;