Issue 4627: Convert Scheme_hash_table to using Smob1

[lilypond.git] / lily / page-layout-problem.cc

diff --git a/lily/page-layout-problem.cc b/lily/page-layout-problem.cc
index 3f4fca05f1fddfb8be11561dc51a71154b465bdb..ebe147d59e6230e65960f845ce0de7a69b4ae08d 100644 (file)
--- a/lily/page-layout-problem.cc
+++ b/lily/page-layout-problem.cc
@@ -35,6 +35,8 @@
 #include "text-interface.hh"
 #include "lily-imports.hh"
 
+using std::vector;
+
 /*
  Returns the number of footnotes associated with a given line.
 */
@@ -187,7 +189,7 @@ Page_layout_problem::add_footnotes_to_lines (SCM lines, int counter, Paper_book
       numbers = scm_cons (stencil, numbers);
 
       if (!st->extent (X_AXIS).is_empty ())
-        max_length = max (max_length, st->extent (X_AXIS)[RIGHT]);
+        max_length = std::max (max_length, st->extent (X_AXIS)[RIGHT]);
 
       counter++;
     }
@@ -663,7 +665,7 @@ Page_layout_problem::append_prob (Prob *prob, Spring const &spring, Real padding
 
   if (sky)
     {
-      minimum_distance = max ((*sky)[UP].distance (bottom_skyline_),
+      minimum_distance = std::max ((*sky)[UP].distance (bottom_skyline_),
                               bottom_loose_baseline_);
       bottom_skyline_ = (*sky)[DOWN];
     }
@@ -1124,7 +1126,7 @@ Page_layout_problem::get_fixed_spacing (Grob *before, Grob *after, int spaceable
         {
           SCM forced = robust_list_ref (spaceable_index - 1, manual_dists);
           if (scm_is_number (forced))
-            ret = max (ret, scm_to_double (forced));
+            ret = std::max (ret, scm_to_double (forced));
         }
     }
 
@@ -1232,7 +1234,7 @@ Page_layout_problem::filter_dead_elements (vector<Grob *> const &input)
   vector<Grob *> output;
   for (vsize i = 0; i < input.size (); ++i)
     {
-      if (Hara_kiri_group_spanner::has_interface (input[i]))
+      if (has_interface<Hara_kiri_group_spanner> (input[i]))
         Hara_kiri_group_spanner::consider_suicide (input[i]);
 
       if (input[i]->is_live ())