CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/05/04 11:03:11
Modified files:
flower/include : real.hh
lily : note-head.cc
Log message:
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/flower/include/real.hh.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/note-head.cc.diff?tr1=1.136&tr2=1.137&r1=text&r2=text
Patches:
Index: lilypond/flower/include/real.hh
diff -u lilypond/flower/include/real.hh:1.19
lilypond/flower/include/real.hh:1.20
--- lilypond/flower/include/real.hh:1.19 Sat Apr 30 23:43:03 2005
+++ lilypond/flower/include/real.hh Wed May 4 11:03:11 2005
@@ -9,6 +9,7 @@
#ifndef REAL_HH
#define REAL_HH
+#include <algorithm>
#include <climits>
typedef double Real;
Index: lilypond/lily/note-head.cc
diff -u lilypond/lily/note-head.cc:1.136 lilypond/lily/note-head.cc:1.137
--- lilypond/lily/note-head.cc:1.136 Sat Apr 30 23:43:03 2005
+++ lilypond/lily/note-head.cc Wed May 4 11:03:11 2005
@@ -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 @@
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",
_______________________________________________
Lilypond-cvs mailing list
Lilypond-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
