X-Git-Url: https://git.donarmstrong.com/lilypond.git?a=blobdiff_plain;f=lily%2Fconstrained-breaking.cc;h=463e84bf113e4434e64398150568aaba6b212a65;hb=5af7cd44435fd26fade6e700a3912630e1553a87;hp=d9054087e1adf493b26b31623516f46f9c62d660;hpb=e860e146ccecf07d42aa53de885916931950245e;p=lilypond.git

diff --git a/lily/constrained-breaking.cc b/lily/constrained-breaking.cc
index d9054087e1..463e84bf11 100644
--- a/lily/constrained-breaking.cc
+++ b/lily/constrained-breaking.cc
@@ -621,7 +621,7 @@ Line_details::spring_length (Line_details const &next_line) const
   // the top of next_line's extent.
   Real refpoint_dist = tallness_ + refpoint_extent_[DOWN] - next_line.refpoint_extent_[UP];
   Real space = next_line.title_ ? title_space_ : space_;
-  return std::max (0.0, space - refpoint_dist);
+  return max (0.0, space - refpoint_dist);
 }
 
 Line_shape::Line_shape (Interval begin, Interval rest)
@@ -633,7 +633,7 @@ Line_shape::Line_shape (Interval begin, Interval rest)
 Line_shape
 Line_shape::piggyback (Line_shape mount, Real padding) const
 {
-  Real elevation = std::max (begin_[UP] - mount.begin_[DOWN], rest_[UP] - mount.rest_[DOWN]);
+  Real elevation = max (begin_[UP] - mount.begin_[DOWN], rest_[UP] - mount.rest_[DOWN]);
   Interval begin = Interval (begin_[DOWN], elevation + mount.begin_[UP] + padding);
   Interval rest = Interval (rest_[DOWN], elevation + mount.rest_[UP] + padding);
   return Line_shape (begin, rest);