Issue 4550 (2/2) Avoid "using namespace std;" in included files

[lilypond.git] / lily / ledger-line-spanner.cc

diff --git a/lily/ledger-line-spanner.cc b/lily/ledger-line-spanner.cc
index 7463f676e93e7c54ce853da11f8edca984ba3c9e..4849cdfee5d31a84bc49f6260239d0f24b2e4137 100644 (file)
--- a/lily/ledger-line-spanner.cc
+++ b/lily/ledger-line-spanner.cc
@@ -18,7 +18,6 @@
 */
 
 #include <map>
-using namespace std;
 
 #include "note-head.hh"
 #include "staff-symbol-referencer.hh"
@@ -132,7 +131,7 @@ Ledger_line_spanner::set_spacing_rods (SCM smob)
         continue;
 
       current_extents[vdir].unite (head_extent);
-      current_head_width = max (current_head_width, head_extent.length ());
+      current_head_width = std::max (current_head_width, head_extent.length ());
     }
 
   if (previous_column && current_column)
@@ -217,7 +216,7 @@ Ledger_line_spanner::print (SCM smob)
           reqs[rank][vdir].ledger_extent_.unite (ledger_extent);
           reqs[rank][vdir].head_extent_.unite (head_extent);
           reqs[rank][vdir].position_
-            = vdir * max (vdir * reqs[rank][vdir].position_, vdir * pos);
+            = vdir * std::max (vdir * reqs[rank][vdir].position_, vdir * pos);
         }
     }
 
@@ -252,7 +251,7 @@ Ledger_line_spanner::print (SCM smob)
                                                   - sign (i->second[d].position_)));
                   Real limit = (center + (both ? which * gap / 2 : 0));
                   lr.ledger_extent_.at (-which)
-                    = which * max (which * lr.ledger_extent_[-which], which * limit);
+                    = which * std::max (which * lr.ledger_extent_[-which], which * limit);
                 }
             }
         }
@@ -297,7 +296,7 @@ Ledger_line_spanner::print (SCM smob)
                                                               head_size[LEFT]),
                                             0.0);
 
-                    Real left_shorten = max (-ledger_size[LEFT] + d, 0.0);
+                    Real left_shorten = std::max (-ledger_size[LEFT] + d, 0.0);
 
                     x_extent[LEFT] += left_shorten;
                     /*