X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspacing-interface.cc;h=b8b3cf0711a96922b35ed987f52ae25df18dc2bd;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=82eb11ef5f1d3816d2e59274c77b531d48236f81;hpb=08560a1b8076630c4fc6cb9b902614d8b74fd6fc;p=lilypond.git

diff --git a/lily/spacing-interface.cc b/lily/spacing-interface.cc
index 82eb11ef5f..b8b3cf0711 100644
--- a/lily/spacing-interface.cc
+++ b/lily/spacing-interface.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2007--2012 Joe Neeman <joeneeman@gmail.com>
+  Copyright (C) 2007--2015 Joe Neeman <joeneeman@gmail.com>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -55,8 +55,7 @@ Spacing_interface::skylines (Grob *me, Grob *right_col)
 
   Drul_array<Grob *> columns (left_col, right_col);
 
-  Direction d = LEFT;
-  do
+  for (LEFT_and_RIGHT (d))
     {
       for (vsize i = 0; i < items[d].size (); i++)
         {
@@ -88,7 +87,6 @@ Spacing_interface::skylines (Grob *me, Grob *right_col)
             }
         }
     }
-  while (flip (&d) != LEFT);
 
   return skylines;
 }
@@ -110,7 +108,7 @@ Spacing_interface::right_column (Grob *me)
   if (!me->is_live ())
     return 0;
 
-  Grob_array *a = unsmob_grob_array (me->get_object ("right-items"));
+  Grob_array *a = Grob_array::unsmob (me->get_object ("right-items"));
   Item *mincol = 0;
   int min_rank = INT_MAX;
   for (vsize i = 0; a && i < a->size (); i++)