Merge branch 'master' into dev/texi2html

[lilypond.git] / lily / easy-notation.cc

diff --git a/lily/easy-notation.cc b/lily/easy-notation.cc
index 7931d08e482fb2e9647b53cebbc3a6bed6c63153..c5d886147b59b5c5c3de32a12cf3fe6b0dde8e9e 100644 (file)
--- a/lily/easy-notation.cc
+++ b/lily/easy-notation.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "note-head.hh"
@@ -45,8 +45,8 @@ Note_head::brew_ez_stencil (SCM smob)
   else
     {
       char s[2] = "a";
-      s[0] = (pit->get_notename () + 2) % 7 + 'a';
-      s[0] = toupper (s[0]);
+      s[0] = char ((pit->get_notename () + 2) % 7 + 'a');
+      s[0] = char (toupper (s[0]));
       charstr = scm_from_locale_string (s);
     }