X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fskyline-pair.cc;h=bab43494a6c68564cbae3886b64a543749a72c5f;hb=90e4d7057f3857da049dfda3d130017d4719bd6b;hp=5dc217d3426217e5174b10699646fedbe2f8cee4;hpb=cb0b407e567feca71cbc5f9479a06b266c69a26c;p=lilypond.git

diff --git a/lily/skyline-pair.cc b/lily/skyline-pair.cc
index 5dc217d342..bab43494a6 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
@@ -122,7 +120,7 @@ Skyline_pair::operator [] (Direction d) const
   return skylines_[d];
 }
 
-const char Skyline_pair::type_p_name_[] = "ly:skyline-pair?";
+const char * const Skyline_pair::type_p_name_ = "ly:skyline-pair?";
 
 
 MAKE_SCHEME_CALLBACK (Skyline_pair, skyline, 2);