From: Han-Wen Nienhuys Date: Mon, 7 Jul 2008 15:22:47 +0000 (-0300) Subject: Fix ambiguous if/else. X-Git-Tag: release/2.11.51-1~1^2~2 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=d53019beadbbf2017e7e0b22d70d567cb2f59a5d;p=lilypond.git Fix ambiguous if/else. --- diff --git a/lily/side-position-interface.cc b/lily/side-position-interface.cc index 73da30e9e3..ceede5d9f1 100644 --- a/lily/side-position-interface.cc +++ b/lily/side-position-interface.cc @@ -96,13 +96,15 @@ Side_position_interface::general_side_position (Grob *me, Axis a, bool use_exten continue; if (e) - if (use_extents) - dim.unite (e->maybe_pure_extent (common, a, pure, start, end)); - else - { - Real x = e->maybe_pure_coordinate (common, a, pure, start, end); - dim.unite (Interval (x, x)); - } + { + if (use_extents) + dim.unite (e->maybe_pure_extent (common, a, pure, start, end)); + else + { + Real x = e->maybe_pure_coordinate (common, a, pure, start, end); + dim.unite (Interval (x, x)); + } + } } if (dim.is_empty ()) @@ -267,7 +269,7 @@ Side_position_interface::aligned_side (Grob *me, Axis a, bool pure, int start, i { Interval iv = me->maybe_pure_extent (me, a, pure, start, end); - Real padding + Real padding = Staff_symbol_referencer::staff_space (me) * scm_to_double (me->get_property ("staff-padding"));