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

[lilypond.git] / lily / include / music-iterator.hh

diff --git a/lily/include/music-iterator.hh b/lily/include/music-iterator.hh
index d5c69d43904030e7bc1508a289e4c59e5069abea..bb095df71869e84bbd25d84042cd30adab580e79 100644 (file)
--- a/lily/include/music-iterator.hh
+++ b/lily/include/music-iterator.hh
@@ -63,7 +63,7 @@ class Music_iterator : public Smob<Music_iterator>
 public:
   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_;
   virtual ~Music_iterator ();
 protected:
   Moment music_length_;
@@ -114,7 +114,7 @@ bool is_child_context (Context *me, Context *child);
 
 #define IMPLEMENT_CTOR_CALLBACK(Class)                                  \
   LY_DEFINE_MEMBER_FUNCTION (Class, constructor, \
-                             mangle_cxx_identifier (std::string (#Class) + "::constructor").c_str(), \
+                             mangle_cxx_identifier (string (#Class) + "::constructor").c_str(), \
                              0, 0, 0,                                   \
                              (),                                        \
                              "")                                        \