Issue 3656/2: disambiguate our own ::to_string from std::to_string

[lilypond.git] / flower / international.cc

diff --git a/flower/international.cc b/flower/international.cc
index 3d149b5d09a1c30ce99c05205795cfcc896ad36b..2e6a09df9fcaf1456097c0d601a3f06cae34018c 100644 (file)
--- a/flower/international.cc
+++ b/flower/international.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2009 Jan Nieuwenhuizen <janneke@gnu.org>
+  Copyright (C) 1997--2012 Jan Nieuwenhuizen <janneke@gnu.org>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -55,8 +55,8 @@ v_f (char const *format, va_list args)
 }
 
 string
-_f (char const *format, string s, string s2, string s3)
+_f (char const *format, const string &s, const string &s2, const string &s3)
 {
   return String_convert::form_string (gettext (format), s.c_str (), s2.c_str (),
-                                     s3.c_str ());
+                                      s3.c_str ());
 }