X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fottava-engraver.cc;h=d236ed779d28439768480e21fedaa41af7efb490;hb=d1ca9346d8e86b873c3cf5511105b0252e6c54ad;hp=fb72fdf80f4697568ed20e05f6da02101016c5ed;hpb=4bb29573149a0ffa1f881c5e38a0fe68e9e76b67;p=lilypond.git

diff --git a/lily/ottava-engraver.cc b/lily/ottava-engraver.cc
index fb72fdf80f..d236ed779d 100644
--- a/lily/ottava-engraver.cc
+++ b/lily/ottava-engraver.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2000--2011 Han-Wen Nienhuys
+  Copyright (C) 2000--2015 Han-Wen Nienhuys
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -99,16 +99,14 @@ Ottava_spanner_engraver::typeset_all ()
 {
   if (finished_)
     {
-      Direction d = LEFT;
-      do
+      for (LEFT_and_RIGHT (d))
         {
           if (!finished_->get_bound (RIGHT))
             {
-              Grob *e = unsmob_grob (get_property ("currentMusicalColumn"));
+              Grob *e = unsmob<Grob> (get_property ("currentMusicalColumn"));
               finished_->set_bound (d, e);
             }
         }
-      while (flip (&d) != LEFT);
 
       finished_ = 0;
     }
@@ -119,7 +117,7 @@ Ottava_spanner_engraver::stop_translation_timestep ()
 {
   if (span_ && !span_->get_bound (LEFT))
     {
-      Grob *e = unsmob_grob (get_property ("currentMusicalColumn"));
+      Grob *e = unsmob<Grob> (get_property ("currentMusicalColumn"));
       span_->set_bound (LEFT, e);
     }