X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fauto-change-iterator.cc;h=41459bd56aef44ba783187d5e57ab40393ee9595;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=b52fb16bb4b8dc80fcc4526cec1c7c2785a5459a;hpb=08560a1b8076630c4fc6cb9b902614d8b74fd6fc;p=lilypond.git

diff --git a/lily/auto-change-iterator.cc b/lily/auto-change-iterator.cc
index b52fb16bb4..41459bd56a 100644
--- a/lily/auto-change-iterator.cc
+++ b/lily/auto-change-iterator.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1999--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1999--2015 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
@@ -38,7 +38,7 @@ protected:
 private:
   SCM split_list_;
   Direction where_dir_;
-  void change_to (Music_iterator *, SCM, string);
+  void change_to (Music_iterator *, SCM, const string&);
   Moment start_moment_;
 
   Context_handle up_;
@@ -47,7 +47,7 @@ private:
 
 void
 Auto_change_iterator::change_to (Music_iterator *it, SCM to_type_sym,
-                                 string to_id)
+                                 const string &to_id)
 {
   Context *current = it->get_outlet ();
   Context *last = 0;
@@ -108,7 +108,7 @@ Auto_change_iterator::process (Moment m)
 
   for (; scm_is_pair (split_list_); split_list_ = scm_cdr (split_list_))
     {
-      splitm = unsmob_moment (scm_caar (split_list_));
+      splitm = Moment::unsmob (scm_caar (split_list_));
       if ((*splitm + start_moment_) > now)
         break;