Issue 4131/1: Reimplement forced partcombine decisions via context properties

[lilypond.git] / lily / vaticana-ligature.cc

diff --git a/lily/vaticana-ligature.cc b/lily/vaticana-ligature.cc
index ddbe0d86bd2ffa12f3054c5b005cb21c73754d6c..c8be2880132f53aa32d1a93b55d33041883522fe 100644 (file)
--- a/lily/vaticana-ligature.cc
+++ b/lily/vaticana-ligature.cc
@@ -29,6 +29,8 @@
 #include "staff-symbol-referencer.hh"
 #include "warn.hh"
 
+using std::string;
+
 Stencil
 vaticana_brew_cauda (Grob *me,
                      int pos,
@@ -106,7 +108,7 @@ vaticana_brew_flexa (Grob *me,
    */
   Real left_height
     = right_height
-      + min (0.12 * abs (interval), 0.3) * staff_space;
+      + std::min (0.12 * abs (interval), 0.3) * staff_space;
 
   /*
    * Compensate optical illusion regarding vertical position of left