X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspacing-interface.cc;h=8f9875ff9795ae176e009c073952df71fbe18503;hb=05bb156d62a3193989f56039906ab9f23d071660;hp=030d02e7272ca63b42df028cad1b85d59d22e9c3;hpb=cee6cea4ed55eb4fa1f9d83c997ebc19744a6e1a;p=lilypond.git diff --git a/lily/spacing-interface.cc b/lily/spacing-interface.cc index 030d02e727..8f9875ff97 100644 --- a/lily/spacing-interface.cc +++ b/lily/spacing-interface.cc @@ -30,6 +30,8 @@ #include "skyline-pair.hh" #include "system.hh" +using std::vector; + /* return the right-pointing skyline of the left-items and the left-pointing skyline of the right-items (with the skyline of the left-items in ret[LEFT]) */ @@ -96,7 +98,7 @@ Spacing_interface::minimum_distance (Grob *me, Grob *right) { Drul_array skylines = Spacing_interface::skylines (me, right); - return max (0.0, skylines[LEFT].distance (skylines[RIGHT])); + return std::max (0.0, skylines[LEFT].distance (skylines[RIGHT])); } /*