Fix #268.

[lilypond.git] / flower / international.cc

diff --git a/flower/international.cc b/flower/international.cc
index c50a3bad3381349dd9a418ffb50ec5dda0dd7637..78dc3ddb3c363e5fc7caa6bf176fad280f2d707b 100644 (file)
--- a/flower/international.cc
+++ b/flower/international.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2007 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "config.hh"
@@ -21,24 +21,30 @@ gettext (char const *s)
 #include <libintl.h>
 #endif
 
-std::string
+string
 _ (char const *ch)
 {
-  return std::string (gettext (ch));
+  return string (gettext (ch));
 }
 
-std::string
+string
 _f (char const *format, ...)
 {
   va_list args;
   va_start (args, format);
-  std::string str = String_convert::vform_string (gettext (format), args);
+  string str = v_f (format, args);
   va_end (args);
   return str;
 }
 
-std::string
-_f (char const *format, std::string s, std::string s2, std::string s3)
+string
+v_f (char const *format, va_list args)
+{
+  return String_convert::vform_string (gettext (format), args);
+}
+
+string
+_f (char const *format, string s, string s2, string s3)
 {
   return String_convert::form_string (gettext (format), s.c_str (), s2.c_str (),
                                      s3.c_str ());