X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fvolta-repeat-iterator.cc;h=c9ffaf816e68cc83671a44a39a9f101e8ec6c9f5;hb=9e781b7dc83b60a543ce218aa1a5f139f74c760f;hp=3e6f58efda470ed86866d0873282a51604cc6d03;hpb=bf562afb0241f46a8e899d73adeb39b5dfdcbda8;p=lilypond.git

diff --git a/lily/volta-repeat-iterator.cc b/lily/volta-repeat-iterator.cc
index 3e6f58efda..c9ffaf816e 100644
--- a/lily/volta-repeat-iterator.cc
+++ b/lily/volta-repeat-iterator.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2002--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2002--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -53,6 +53,7 @@ void
 Volta_repeat_iterator::derived_mark () const
 {
   scm_gc_mark (alt_restores_);
+  Sequential_iterator::derived_mark ();
 }
 
 SCM
@@ -103,7 +104,7 @@ Volta_repeat_iterator::next_element (bool side_effect)
     {
       if (alt_count_)
         {
-          string repstr = to_string (rep_count_ - alt_count_ + done_count_) + ".";
+          string repstr = ::to_string (rep_count_ - alt_count_ + done_count_) + ".";
           if (done_count_ <= 1)
             {
               alt_restores_ = SCM_EOL;
@@ -142,7 +143,7 @@ Volta_repeat_iterator::next_element (bool side_effect)
             }
 
           if (done_count_ == 1 && alt_count_ < rep_count_)
-            repstr = "1.--" + to_string (rep_count_ - alt_count_ + done_count_) + ".";
+            repstr = "1.--" + ::to_string (rep_count_ - alt_count_ + done_count_) + ".";
 
           if (done_count_ <= alt_count_)
             add_repeat_command (scm_list_n (ly_symbol2scm ("volta"),