Issue 5167/6: Changes: show \markup xxx = ... \etc assignments

[lilypond.git] / lily / spacing-determine-loose-columns.cc

diff --git a/lily/spacing-determine-loose-columns.cc b/lily/spacing-determine-loose-columns.cc
index 00e6e125dd4bb0b37fda9539106b57e3064fdaa8..4be23042ad44bbddc007c8879714cd0c201bd35d 100644 (file)
--- a/lily/spacing-determine-loose-columns.cc
+++ b/lily/spacing-determine-loose-columns.cc
@@ -32,8 +32,6 @@
 #include "break-align-interface.hh"
 #include "warn.hh"
 
-using std::vector;
-
 /*
   Return whether COL is fixed to its neighbors by some kind of spacing
   constraint.
@@ -161,13 +159,13 @@ Spacing_spanner::set_distances_for_loose_col (Grob *me, Grob *c,
               Spring base = note_spacing (me, lc, rc, options);
               Spring spring = Note_spacing::get_spacing (sp, rc, base, options->increment_);
 
-              dists[d] = std::max (dists[d], spring.min_distance ());
+              dists[d] = max (dists[d], spring.min_distance ());
             }
           else if (has_interface<Staff_spacing> (sp))
             {
               Spring spring = Staff_spacing::get_spacing (sp, rc, 0.0);
 
-              dists[d] = std::max (dists[d], spring.min_distance ());
+              dists[d] = max (dists[d], spring.min_distance ());
             }
           else
             programming_error ("Subversive spacing wish");