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

[lilypond.git] / lily / break-alignment-interface.cc

diff --git a/lily/break-alignment-interface.cc b/lily/break-alignment-interface.cc
index 58cb488d6b920efd83d21efbe841f9af8d7770fc..305f764ad32be5bf97c19a3ae4c9ef6e31aa5873 100644 (file)
--- a/lily/break-alignment-interface.cc
+++ b/lily/break-alignment-interface.cc
@@ -29,6 +29,9 @@
 #include "side-position-interface.hh"
 #include "warn.hh"
 
+using std::string;
+using std::vector;
+
 /*
   This is tricky: we cannot modify 'elements, since callers are
   iterating the same list. Reordering the list in-place, or resetting
@@ -215,7 +218,7 @@ Break_alignment_interface::calc_positioning_done (SCM smob)
                                 - extents[next_idx][LEFT];
           /* should probably junk minimum-space */
           else if (scm_is_eq (type, ly_symbol2scm ("minimum-space")))
-            offsets[next_idx] = max (extents[idx][RIGHT], distance);
+            offsets[next_idx] = std::max (extents[idx][RIGHT], distance);
         }
       else
         {
@@ -263,7 +266,7 @@ Break_alignable_interface::self_align_callback (SCM grob)
 {
   Grob *me = unsmob<Grob> (grob);
   Item *alignment = dynamic_cast<Item *> (me->get_parent (X_AXIS));
-  if (!Break_alignment_interface::has_interface (alignment))
+  if (!has_interface<Break_alignment_interface> (alignment))
     return scm_from_int (0);
 
   SCM symbol_list = me->get_property ("break-align-symbols");