Issue 4814: grob.cc segfaults with gcc6

[lilypond.git] / lily / break-alignment-interface.cc

diff --git a/lily/break-alignment-interface.cc b/lily/break-alignment-interface.cc
index 305f764ad32be5bf97c19a3ae4c9ef6e31aa5873..e2a546f6a676ed1ecbbbc85ef56414aea512e0a2 100644 (file)
--- a/lily/break-alignment-interface.cc
+++ b/lily/break-alignment-interface.cc
@@ -29,9 +29,6 @@
 #include "side-position-interface.hh"
 #include "warn.hh"
 
-using std::string;
-using std::vector;
-
 /*
   This is tricky: we cannot modify 'elements, since callers are
   iterating the same list. Reordering the list in-place, or resetting
@@ -218,7 +215,7 @@ Break_alignment_interface::calc_positioning_done (SCM smob)
                                 - extents[next_idx][LEFT];
           /* should probably junk minimum-space */
           else if (scm_is_eq (type, ly_symbol2scm ("minimum-space")))
-            offsets[next_idx] = std::max (extents[idx][RIGHT], distance);
+            offsets[next_idx] = max (extents[idx][RIGHT], distance);
         }
       else
         {