input/regression/bookparts.ly fails at PDF conversion stage

[lilypond.git] / lily / skyline-pair.cc

diff --git a/lily/skyline-pair.cc b/lily/skyline-pair.cc
index 92ae97a342e0961571b066c0ad4b30775ea050b0..5dc217d3426217e5174b10699646fedbe2f8cee4 100644 (file)
--- a/lily/skyline-pair.cc
+++ b/lily/skyline-pair.cc
@@ -22,6 +22,8 @@
 
 #include "international.hh"
 
+using std::vector;
+
 Skyline_pair::Skyline_pair ()
   : skylines_ (Skyline (DOWN), Skyline (UP))
 {
@@ -85,13 +87,13 @@ Skyline_pair::print () const
 Real
 Skyline_pair::left () const
 {
-  return min (skylines_[UP].left (), skylines_[DOWN].left ());
+  return std::min (skylines_[UP].left (), skylines_[DOWN].left ());
 }
 
 Real
 Skyline_pair::right () const
 {
-  return max (skylines_[UP].right (), skylines_[DOWN].right ());
+  return std::max (skylines_[UP].right (), skylines_[DOWN].right ());
 }
 
 void
@@ -127,7 +129,7 @@ MAKE_SCHEME_CALLBACK (Skyline_pair, skyline, 2);
 SCM
 Skyline_pair::skyline (SCM smob, SCM dir_scm)
 {
-  Skyline_pair *sp = Skyline_pair::unsmob (smob);
+  Skyline_pair *sp = unsmob<Skyline_pair> (smob);
   Direction dir = robust_scm2dir (dir_scm, UP);
 
   if (dir == CENTER)