X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frest-collision.cc;h=ea9dba5010deaf58d060ac1a81998029ac254b72;hb=4a9a2dcf5b062075c01f019da36963ec7ae34b7b;hp=7bfc3385f1624d173791b949b82b4e4e7f296ec6;hpb=94ccd9e7b18d183aff2036b1b0c4d644e67404e4;p=lilypond.git

diff --git a/lily/rest-collision.cc b/lily/rest-collision.cc
index 7bfc3385f1..ea9dba5010 100644
--- a/lily/rest-collision.cc
+++ b/lily/rest-collision.cc
@@ -26,8 +26,8 @@ SCM
 Rest_collision::force_shift_callback (SCM element_smob, SCM axis)
 {
   Grob *them = unsmob_grob (element_smob);
-  Axis a = (Axis) scm_to_int (axis);
-  assert (a == Y_AXIS);
+  (void) axis;
+  assert (scm_to_int (axis) == Y_AXIS);
 
   if (Note_column::has_rests (them))
     {
@@ -234,7 +234,7 @@ Rest_collision::do_shift (Grob *me)
 	}
 
       Real dist
-	= minimum_dist + dir * (notedim[dir] - restdim[-dir]) >? 0;
+	= minimum_dist + dir * max (notedim[dir] - restdim[-dir], 0.0);
 
       int stafflines = Staff_symbol_referencer::line_count (me);
       if (!stafflines)