* VERSION (MY_PATCH_LEVEL): make 1.7.0

[lilypond.git] / lily / unfolded-repeat-iterator.cc

diff --git a/lily/unfolded-repeat-iterator.cc b/lily/unfolded-repeat-iterator.cc
index ff5cf9603d7ede3bae925250e723bb6da8de2d23..f4f56af6e4441ccc7bbec9f6be8084822785e362 100644 (file)
--- a/lily/unfolded-repeat-iterator.cc
+++ b/lily/unfolded-repeat-iterator.cc
@@ -15,7 +15,7 @@ source file of the GNU LilyPond music typesetter
 class Unfolded_repeat_iterator : public Sequential_iterator
 {
 public:
-  static  SCM constructor_cxx_function;
+  DECLARE_SCHEME_CALLBACK(constructor, ());
   VIRTUAL_COPY_CONS (Music_iterator);
 protected:
   virtual SCM get_music_list () const;
@@ -56,7 +56,7 @@ Unfolded_repeat_iterator::get_music_list () const
 class Volta_repeat_iterator : public Sequential_iterator
 {
 public:
-  static  SCM constructor_cxx_function;
+  DECLARE_SCHEME_CALLBACK(constructor, ());
   VIRTUAL_COPY_CONS (Music_iterator);
   Volta_repeat_iterator();
 
@@ -146,7 +146,7 @@ Volta_repeat_iterator::next_element (bool side_effect)
 
          if (done_count_ <= alt_count_)
            add_repeat_command (scm_list_n (ly_symbol2scm ("volta"),
-                                           ly_str02scm (repstr.to_str0 ()), SCM_UNDEFINED));
+                                           scm_makfrom0str (repstr.to_str0 ()), SCM_UNDEFINED));
        }
       else
        {