X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspring.cc;h=d1640e72b9790fb2d96991a743cfebef63f62f81;hb=750b714488c5af6eae22d07163bba8b554734ac6;hp=5dfc3c804ce1792612d3563deb695378ec687e5d;hpb=59a6d1a06432fc0ca88c3023c646182f389ec1b5;p=lilypond.git

diff --git a/lily/spring.cc b/lily/spring.cc
index 5dfc3c804c..d1640e72b9 100644
--- a/lily/spring.cc
+++ b/lily/spring.cc
@@ -36,8 +36,6 @@
 
 #include "spring.hh"
 
-using std::vector;
-
 Spring::Spring ()
 {
   distance_ = 1.0;
@@ -86,8 +84,8 @@ Spring::update_blocking_force ()
 void
 Spring::operator *= (Real r)
 {
-  distance_ = std::max (min_distance_, distance_ * r);
-  inverse_compress_strength_ = std::max (0.0, distance_ - min_distance_);
+  distance_ = max (min_distance_, distance_ * r);
+  inverse_compress_strength_ = max (0.0, distance_ - min_distance_);
   inverse_stretch_strength_ *= r;
   update_blocking_force ();
 }
@@ -113,13 +111,13 @@ merge_springs (vector<Spring> const &springs)
       avg_distance += springs[i].distance ();
       avg_stretch += springs[i].inverse_stretch_strength ();
       avg_compress += 1 / springs[i].inverse_compress_strength ();
-      min_distance = std::max (springs[i].min_distance (), min_distance);
+      min_distance = max (springs[i].min_distance (), min_distance);
     }
 
   avg_stretch /= Real (springs.size ());
   avg_compress /= Real (springs.size ());
   avg_distance /= Real (springs.size ());
-  avg_distance = std::max (min_distance + 0.3, avg_distance);
+  avg_distance = max (min_distance + 0.3, avg_distance);
 
   Spring ret = Spring (avg_distance, min_distance);
   ret.set_inverse_stretch_strength (avg_stretch);
@@ -155,7 +153,7 @@ Spring::set_min_distance (Real d)
 void
 Spring::ensure_min_distance (Real d)
 {
-  set_min_distance (std::max (d, min_distance_));
+  set_min_distance (max (d, min_distance_));
 }
 
 void
@@ -217,7 +215,7 @@ Spring::set_default_stretch_strength ()
 Real
 Spring::length (Real f) const
 {
-  Real force = std::max (f, blocking_force_);
+  Real force = max (f, blocking_force_);
   Real inv_k = force < 0.0 ? inverse_compress_strength_ : inverse_stretch_strength_;
 
   if (isinf (force))
@@ -229,6 +227,6 @@ Spring::length (Real f) const
   // There is a corner case here: if min_distance_ is larger than
   // distance_ but the spring is fixed, then inv_k will be zero
   // and we need to make sure that we return min_distance_.
-  return std::max (min_distance_, distance_ + force * inv_k);
+  return max (min_distance_, distance_ + force * inv_k);
 }