Doc-es: update Notation/Pitches.

[lilypond.git] / lily / side-position-interface.cc

diff --git a/lily/side-position-interface.cc b/lily/side-position-interface.cc
index 2e4591153a2a8af143c4630fad4f4ba0e31ab4e0..16e2929a6699001fd029f7e43548097ec62031c6 100644 (file)
--- a/lily/side-position-interface.cc
+++ b/lily/side-position-interface.cc
@@ -24,6 +24,7 @@
 #include <set>
 #include <map>
 
+using namespace std;
 
 #include "accidental-interface.hh"
 #include "accidental-placement.hh"
@@ -47,10 +48,6 @@
 #include "warn.hh"
 #include "unpure-pure-container.hh"
 
-using std::set;
-using std::string;
-using std::vector;
-
 void
 Side_position_interface::add_support (Grob *me, Grob *e)
 {
@@ -347,7 +344,7 @@ Side_position_interface::aligned_side (Grob *me, Axis a, bool pure, int start, i
     total_off = minimum_space * dir;
 
   if (current_off)
-    total_off = dir * std::max (dir * total_off,
+    total_off = dir * max (dir * total_off,
                            dir * (*current_off));
 
   /* FIXME: 1000 should relate to paper size.  */
@@ -406,7 +403,7 @@ Side_position_interface::aligned_side (Grob *me, Axis a, bool pure, int start, i
           Real diff = (dir * staff_extent[dir] + staff_padding
                        - dir * total_off
                        + dir * (staff_position - parent_position));
-          total_off += dir * std::max (diff, 0.0);
+          total_off += dir * max (diff, 0.0);
         }
     }
   return scm_from_double (total_off);