(ly_module_define): only define variable if

[lilypond.git] / lily / auto-change-iterator.cc

diff --git a/lily/auto-change-iterator.cc b/lily/auto-change-iterator.cc
index 3ab3f6b427ff1bbf2e34d220f63d17b897b87f5d..7b73db03caea743a8bd1ee6af3a2921c119c4ca0 100644 (file)
--- a/lily/auto-change-iterator.cc
+++ b/lily/auto-change-iterator.cc
@@ -56,7 +56,7 @@ Auto_change_iterator::change_to (Music_iterator *it, SCM to_type_sym,
       current = current->get_parent_context ();
     }
 
-  if (current && current->id_string_ == to_id)
+  if (current && current->id_string () == to_id)
     {
       String msg;
       msg += _ ("Can't switch translators, I'm there already");
@@ -91,7 +91,7 @@ Auto_change_iterator::process (Moment m)
   Moment now = get_outlet ()->now_mom ();
   Moment *splitm = 0;
   
-  for (; is_pair (split_list_); split_list_ = ly_cdr (split_list_))
+  for (; ly_c_pair_p (split_list_); split_list_ = ly_cdr (split_list_))
     {
       splitm = unsmob_moment (ly_caar (split_list_));
       if ((*splitm + start_moment_) > now)