Issue 4878: Make type_p_name_ always char pointer

[lilypond.git] / lily / include / pitch.hh

diff --git a/lily/include/pitch.hh b/lily/include/pitch.hh
index 8ba72b3701cd22f897595fdadd9d43df143f4526..dad2bc1246727c5fc4f5dc016b78c7f2c788347b 100644 (file)
--- a/lily/include/pitch.hh
+++ b/lily/include/pitch.hh
@@ -38,7 +38,7 @@ public:
   static SCM equal_p (SCM, SCM);
   int print_smob (SCM, scm_print_state *) const;
   SCM mark_smob () const;
-  static const char type_p_name_[];
+  static const char * const type_p_name_;
 private:
   int octave_;
   int notename_;
@@ -72,7 +72,7 @@ public:
   int rounded_semitone_pitch () const;
   int rounded_quartertone_pitch () const;
   Pitch negated () const;
-  std::string to_string () const;
+  string to_string () const;
 
   DECLARE_SCHEME_CALLBACK (less_p, (SCM a, SCM b));
 };