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

[lilypond.git] / lily / file-name-map.cc

diff --git a/lily/file-name-map.cc b/lily/file-name-map.cc
index e0fd5d5fba13bd623f6506081e5e90fc3c8caa52..d9b9711ba139093afd040be904b75c9188ed8f0b 100644 (file)
--- a/lily/file-name-map.cc
+++ b/lily/file-name-map.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2005--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2005--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -23,19 +23,22 @@ using namespace std;
 #include "file-name-map.hh"
 #include "lily-guile.hh"
 
+using std::map;
+using std::string;
+
 map<string, string> file_name_map_global;
 
 string
-map_file_name (string s)
+map_file_name (const string &s)
 {
   if (file_name_map_global.find (s) != file_name_map_global.end ())
-    s = file_name_map_global[s];
+    return file_name_map_global[s];
   return s;
 }
 
 LY_DEFINE (ly_add_file_name_alist, "ly:add-file-name-alist",
-          1, 0, 0, (SCM alist),
-          "Add mappings for error messages from @var{alist}.")
+           1, 0, 0, (SCM alist),
+           "Add mappings for error messages from @var{alist}.")
 {
   for (SCM s = alist; scm_is_pair (s); s = scm_cdr (s))
     {