X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpitch.cc;h=ee03ac44d8db2e53a782e0732acb766e23b6914a;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=610e30480f5ebbaf34b8370c8e26f9acfa8fefb3;hpb=1de3d397c18622b6061402fef18e625701712bc5;p=lilypond.git

diff --git a/lily/pitch.cc b/lily/pitch.cc
index 610e30480f..ee03ac44d8 100644
--- a/lily/pitch.cc
+++ b/lily/pitch.cc
@@ -26,8 +26,6 @@
 
 #include <cmath>
 
-using std::string;
-
 Pitch::Pitch (int o, int n, Rational a)
 {
   notename_ = n;
@@ -220,7 +218,7 @@ 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 () const
@@ -240,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_