Issue 4568: Check in Texinfo from upstream svn://svn.savannah.gnu.org/texinfo/trunk...

[lilypond.git] / lily / spacing-basic.cc

diff --git a/lily/spacing-basic.cc b/lily/spacing-basic.cc
index 20f76dfda072aa924932d5c1136f9c18ca96ffa4..4ed797d673b5227e01954848c0fa037259d8ae88 100644 (file)
--- a/lily/spacing-basic.cc
+++ b/lily/spacing-basic.cc
@@ -40,11 +40,11 @@
 Spring
 Spacing_spanner::standard_breakable_column_spacing (Grob *me, Item *l, Item *r, Spacing_options const *options)
 {
-  Real min_dist = max (0.0, Paper_column::minimum_distance (l, r));
+  Real min_dist = std::max (0.0, Paper_column::minimum_distance (l, r));
 
   if (Paper_column::is_breakable (l) && Paper_column::is_breakable (r))
     {
-      Moment *dt = Moment::unsmob (l->get_property ("measure-length"));
+      Moment *dt = unsmob<Moment> (l->get_property ("measure-length"));
       Moment mlen (1);
       if (dt)
         mlen = *dt;
@@ -91,7 +91,7 @@ get_measure_length (Grob *column)
 
   do
     {
-      if (Moment *len = Moment::unsmob (cols[col_idx]->get_property ("measure-length")))
+      if (Moment *len = unsmob<Moment> (cols[col_idx]->get_property ("measure-length")))
         {
           return len;
         }
@@ -111,8 +111,8 @@ Spacing_spanner::note_spacing (Grob * /* me */,
   Moment shortest_playing_len = 0;
   SCM s = lc->get_property ("shortest-playing-duration");
 
-  if (Moment::is_smob (s))
-    shortest_playing_len = *Moment::unsmob (s);
+  if (unsmob<Moment> (s))
+    shortest_playing_len = *unsmob<Moment> (s);
 
   if (! shortest_playing_len.to_bool ())
     {
@@ -136,13 +136,13 @@ Spacing_spanner::note_spacing (Grob * /* me */,
 
   if (Moment *measure_len = get_measure_length (lc))
     {
-      delta_t = min (delta_t, *measure_len);
+      delta_t = std::min (delta_t, *measure_len);
 
       /*
         The following is an extra safety measure, such that
         the length of a mmrest event doesn't cause havoc.
       */
-      shortest_playing_len = min (shortest_playing_len, *measure_len);
+      shortest_playing_len = std::min (shortest_playing_len, *measure_len);
     }
 
   Spring ret;
@@ -157,11 +157,11 @@ Spacing_spanner::note_spacing (Grob * /* me */,
       ret = Spring (fraction * len, fraction * min);
 
       // Stretch proportional to the space between canonical bare noteheads
-      ret.set_inverse_stretch_strength (fraction * max (0.1, (len - min)));
+      ret.set_inverse_stretch_strength (fraction * std::max (0.1, (len - min)));
     }
   else if (delta_t.grace_part_)
     {
-      Grob *grace_spacing = Grob::unsmob (lc->get_object ("grace-spacing"));
+      Grob *grace_spacing = unsmob<Grob> (lc->get_object ("grace-spacing"));
       if (grace_spacing)
         {
           Spacing_options grace_opts;