Run `make grand-replace'.

[lilypond.git] / flower / getopt-long.cc

diff --git a/flower/getopt-long.cc b/flower/getopt-long.cc
index 17c1eafb7d9bd191cb056947b156d53debe2da25..7e1f3353357ccdeff64756ad5ef31d0bfad80d6d 100644 (file)
--- a/flower/getopt-long.cc
+++ b/flower/getopt-long.cc
@@ -1,7 +1,7 @@
 /*
   process command line, GNU style.
 
-  this is Copyleft (c) 1996--2006 Han-Wen Nienhuys, <hanwen@xs4all.nl>
+  this is Copyleft (c) 1996--2008 Han-Wen Nienhuys, <hanwen@xs4all.nl>
 */
 
 #include "getopt-long.hh"
@@ -12,7 +12,6 @@
 
 #include "config.hh"
 #include "international.hh"
-#include "std-string.hh"
 
 #if !HAVE_GETTEXT
 inline char *
@@ -142,7 +141,7 @@ Getopt_long::report (Errorcod c)
                 found_option_->to_string ());
       break;
     case E_NOARGEXPECT:
-      str += _f ("option `%s' doesn't allow an argument",
+      str += _f ("option `%s' does not allow an argument",
                 found_option_->to_string ());
       break;
     case E_UNKNOWNOPTION:
@@ -311,7 +310,7 @@ Long_option_init::table_string (Long_option_init *l)
       s += string (wid - s.length () + EXTRA_SPACES, ' ');
 
       string help_text (gettext (l[i].help_str0_));
-      replace_all (help_text, "\n",
+      replace_all (&help_text, "\n",
                   "\n" + string (wid + EXTRA_SPACES + 2, ' '));
       tabstr += s + help_text + "\n";
     }