Merge commit 'origin' into beamlets2

[lilypond.git] / lily / font-metric.cc

diff --git a/lily/font-metric.cc b/lily/font-metric.cc
index 655d992123f4859cbc4d73cbdf430d22fbaafc4e..d9ccecbc91430826aae2eb90db2fdd400ac35217 100644 (file)
--- a/lily/font-metric.cc
+++ b/lily/font-metric.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1999--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   Mats Bengtsson <matsb@s3.kth.se> (the ugly TeX parsing in text_dimension)
 */
@@ -31,7 +31,7 @@ Font_metric::design_size () const
 Stencil
 Font_metric::find_by_name (string s) const
 {
-  replace_all (s, '-', 'M');
+  replace_all (&s, '-', 'M');
   int idx = name_to_index (s);
   Box b;
 
@@ -185,9 +185,8 @@ Font_metric::word_stencil (string str) const
 }
 
 Stencil
-Font_metric::text_stencil (string str) const
+Font_metric::text_stencil (string /* str */) const
 {
-  (void) str;
   programming_error("Cannot get a text stencil from this font");
   return Stencil (Box (), SCM_EOL);
 }