X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffile-name-map.cc;h=6266aec3c34e0c90a3275453eb51b9d53faa8530;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=e0fd5d5fba13bd623f6506081e5e90fc3c8caa52;hpb=1c846b2c2348b4e0ca4a3c2e8fb267047ba2d203;p=lilypond.git diff --git a/lily/file-name-map.cc b/lily/file-name-map.cc index e0fd5d5fba..6266aec3c3 100644 --- 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 + Copyright (C) 2005--2015 Han-Wen Nienhuys LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -26,16 +26,16 @@ using namespace std; map 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)) {