X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fskyline-pair.cc;h=b3c2b96df4ad9d4e34eb4641a8eef63a91a58db8;hb=0398fdb9df24ac2e22a8cbff1b3c18ca04e9f221;hp=5dc217d3426217e5174b10699646fedbe2f8cee4;hpb=cb0b407e567feca71cbc5f9479a06b266c69a26c;p=lilypond.git diff --git a/lily/skyline-pair.cc b/lily/skyline-pair.cc index 5dc217d342..b3c2b96df4 100644 --- a/lily/skyline-pair.cc +++ b/lily/skyline-pair.cc @@ -22,8 +22,6 @@ #include "international.hh" -using std::vector; - Skyline_pair::Skyline_pair () : skylines_ (Skyline (DOWN), Skyline (UP)) { @@ -87,13 +85,13 @@ Skyline_pair::print () const Real Skyline_pair::left () const { - return std::min (skylines_[UP].left (), skylines_[DOWN].left ()); + return min (skylines_[UP].left (), skylines_[DOWN].left ()); } Real Skyline_pair::right () const { - return std::max (skylines_[UP].right (), skylines_[DOWN].right ()); + return max (skylines_[UP].right (), skylines_[DOWN].right ()); } void