Release: bump Welcome versions.

[lilypond.git] / lily / tuplet-number.cc

diff --git a/lily/tuplet-number.cc b/lily/tuplet-number.cc
index a28458b2b8857c8b7aa6fda28f81eb078b78e35a..99e61b2ff55162d549bbf72b084029e071611df8 100644 (file)
--- a/lily/tuplet-number.cc
+++ b/lily/tuplet-number.cc
@@ -34,8 +34,6 @@
 #include "stem.hh"
 #include "warn.hh"
 
-using std::vector;
-
 /*
   The reference stem is used to determine on which side of the beam to place
   the tuplet number when it is positioned independently of a bracket.  (The number
@@ -338,11 +336,11 @@ count_beams_not_touching_stem (SCM beaming)
 
   for (SCM s = scm_car (beaming); scm_is_pair (s); s = scm_cdr (s))
     {
-      if (scm_is_true (scm_c_memq (scm_car (s), scm_cdr (beaming))))
+      if (scm_is_true (ly_memv (scm_car (s), scm_cdr (beaming))))
         ++count;
     }
 
-  return std::max (0, count - 1);
+  return max (0, count - 1);
 }
 
 MAKE_SCHEME_CALLBACK (Tuplet_number, calc_y_offset, 1);
@@ -418,8 +416,8 @@ Tuplet_number::calc_y_offset (SCM smob)
                   : staff_ext_y[DOWN] > ref_stem_ext[UP];
       if (move)
         {
-          Interval ledger_domain = Interval (std::min (staff_ext_y[UP], ref_stem_ext[UP]),
-                                             std::max (staff_ext_y[DOWN], ref_stem_ext[DOWN]));
+          Interval ledger_domain = Interval (min (staff_ext_y[UP], ref_stem_ext[UP]),
+                                             max (staff_ext_y[DOWN], ref_stem_ext[DOWN]));
           Interval num_y (me->extent (commony, Y_AXIS));
           num_y.translate (y_offset);
           Interval num_ledger_overlap (num_y);