X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbar-check-iterator.cc;h=2a3efe757c74fee0746b691a595f366e24e19d87;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=ea4794897d3353f9fddae5c607ffe1f33fd78898;hpb=c83a3afbc51c62769cbb8963371d37b312bbcd42;p=lilypond.git

diff --git a/lily/bar-check-iterator.cc b/lily/bar-check-iterator.cc
index ea4794897d..2a3efe757c 100644
--- a/lily/bar-check-iterator.cc
+++ b/lily/bar-check-iterator.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2001--2012  Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2001--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
@@ -27,7 +27,7 @@
   Check bar checks. We do this outside the engravers so that you can
   race through the score using skipTypesetting to correct durations.
 */
-class Bar_check_iterator : Music_iterator
+class Bar_check_iterator : Simple_music_iterator
 {
 public:
   virtual void process (Moment);
@@ -44,7 +44,7 @@ Bar_check_iterator::Bar_check_iterator ()
 void
 Bar_check_iterator::process (Moment m)
 {
-  Music_iterator::process (m);
+  Simple_music_iterator::process (m);
   if (!m.to_bool ())
     {
       Context *tr = get_outlet ();
@@ -56,7 +56,7 @@ Bar_check_iterator::process (Moment m)
       SCM mp = tr->get_property ("measurePosition");
       SCM sync = tr->get_property ("barCheckSynchronize");
 
-      Moment *where = unsmob_moment (mp);
+      Moment *where = Moment::unsmob (mp);
       if (!where)
         return;
 
@@ -73,8 +73,8 @@ Bar_check_iterator::process (Moment m)
           else
             {
               SCM lf = tr->get_property ("barCheckLastFail");
-              if (unsmob_moment (lf)
-                  && *unsmob_moment (lf) == *where)
+              if (Moment::is_smob (lf)
+                  && *Moment::unsmob (lf) == *where)
                 warn = false;
               else
                 tr->set_property ("barCheckLastFail", mp);