X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspacing-determine-loose-columns.cc;h=00e6e125dd4bb0b37fda9539106b57e3064fdaa8;hb=59a6d1a06432fc0ca88c3023c646182f389ec1b5;hp=12859cb1915a0c05b2c132046ac9cd0879b2fed5;hpb=f127e14af04f474d20406ca0e0f76f05061ee103;p=lilypond.git

diff --git a/lily/spacing-determine-loose-columns.cc b/lily/spacing-determine-loose-columns.cc
index 12859cb191..00e6e125dd 100644
--- a/lily/spacing-determine-loose-columns.cc
+++ b/lily/spacing-determine-loose-columns.cc
@@ -161,13 +161,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] = max (dists[d], spring.min_distance ());
+              dists[d] = std::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] = max (dists[d], spring.min_distance ());
+              dists[d] = std::max (dists[d], spring.min_distance ());
             }
           else
             programming_error ("Subversive spacing wish");