Revert "Issue 4550 (2/2) Avoid "using namespace std;" in included files"

[lilypond.git] / flower / international.cc

diff --git a/flower/international.cc b/flower/international.cc
index 17a9d49007d853be5d9c3266541ed248b3f723ca..21f3ef97a1c5eb22598d08abd53008172788429c 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--2011 Jan Nieuwenhuizen <janneke@gnu.org>
+  Copyright (C) 1997--2015 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
@@ -32,6 +32,8 @@ gettext (char const *s)
 #include <libintl.h>
 #endif
 
+using std::string;
+
 string
 _ (char const *ch)
 {
@@ -55,8 +57,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 ());
 }