Merge branch 'master' of /home/jcharles/GIT/Lily/. into translation

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

diff --git a/lily/include/duration.hh b/lily/include/duration.hh
index 303fecbeffcb8f97eeaf2e19162196807e418967..6233fc1b2d4fdff1c897cc33c040e8145fbf457e 100644 (file)
--- a/lily/include/duration.hh
+++ b/lily/include/duration.hh
@@ -29,11 +29,11 @@ struct Duration : public Simple_smob<Duration>
 {
   static SCM equal_p (SCM, SCM);
   int print_smob (SCM, scm_print_state *) const;
-  static const char type_p_name_[];
+  static const char * const type_p_name_;
   Duration ();
   Duration (int, int);
   Duration (Rational, bool scale);
-  std::string to_string () const;
+  string to_string () const;
 
   Duration compressed (Rational) const;
   Rational get_length () const;