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

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

diff --git a/lily/spacing-interface.cc b/lily/spacing-interface.cc
index 1ade62b0e53224ffd2568d794bf18b43de578b79..8f9875ff9795ae176e009c073952df71fbe18503 100644 (file)
--- a/lily/spacing-interface.cc
+++ b/lily/spacing-interface.cc
@@ -30,6 +30,8 @@
 #include "skyline-pair.hh"
 #include "system.hh"
 
+using std::vector;
+
 /* return the right-pointing skyline of the left-items and the left-pointing
    skyline of the right-items (with the skyline of the left-items in
    ret[LEFT]) */
@@ -64,7 +66,7 @@ Spacing_interface::skylines (Grob *me, Grob *right_col)
             if (Item *piece = g->find_prebroken_piece (break_dirs[d]))
               g = piece;
 
-          if (g && Separation_item::has_interface (g) && g->get_column () == columns[d])
+          if (has_interface<Separation_item> (g) && g->get_column () == columns[d])
             {
               SCM sky_scm = g->get_property ("horizontal-skylines");
               Skyline_pair *sky = unsmob<Skyline_pair> (sky_scm);
@@ -96,7 +98,7 @@ Spacing_interface::minimum_distance (Grob *me, Grob *right)
 {
   Drul_array<Skyline> skylines = Spacing_interface::skylines (me, right);
 
-  return max (0.0, skylines[LEFT].distance (skylines[RIGHT]));
+  return std::max (0.0, skylines[LEFT].distance (skylines[RIGHT]));
 }
 
 /*
@@ -144,9 +146,9 @@ get_note_columns (vector<Grob *> const &elts)
 
   for (vsize i = 0; i < elts.size (); i++)
     {
-      if (Note_column::has_interface (elts[i]))
+      if (has_interface<Note_column> (elts[i]))
         ret.push_back (dynamic_cast<Item *> (elts[i]));
-      else if (Separation_item::has_interface (elts[i]))
+      else if (has_interface<Separation_item> (elts[i]))
         {
           extract_grob_set (elts[i], "elements", more_elts);
           vector<Item *> ncs = get_note_columns (more_elts);