*** empty log message ***

diff --git a/flower/include/real.hh b/flower/include/real.hh
index d8daa644335e92c27696bbf2c916fa49f6d41bdd..8a62bbceb92f5f93372155cfddb413a841886e12 100644 (file)
--- a/flower/include/real.hh
+++ b/flower/include/real.hh
@@ -9,6 +9,7 @@
 #ifndef REAL_HH
 #define REAL_HH
 
+#include <algorithm>
 #include <climits>
 
 typedef double Real;

diff --git a/lily/note-head.cc b/lily/note-head.cc
index 6096c7cd00aabde6fc10f1ef2656d05a3bf9808e..c3844dae6beba4c09c2d39503c419f82c3d5cb44 100644 (file)
--- a/lily/note-head.cc
+++ b/lily/note-head.cc
@@ -10,6 +10,9 @@
 
 #include <math.h>
 #include <cctype>
+#include <algorithm>           //  min, max
+
+using namespace std; 
 
 #include "directional-element-interface.hh"
 #include "staff-symbol.hh"
@@ -162,7 +165,7 @@ int
 Note_head::get_balltype (Grob *me)
 {
   SCM s = me->get_property ("duration-log");
-  return scm_is_number (s) ? min (scm_to_int (s), 2) : 0;
+  return scm_is_number (s) ? min ((int) scm_to_int (s), (int) 2) : 0;
 }
 
 ADD_INTERFACE (Note_head, "note-head-interface",