X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fwarn-scheme.cc;h=fe6729d112c25075e733a6e5ccfb53d37cd70cff;hb=c8d62eca2d025e1fdce22f478f87c10f414d4b9d;hp=9e140dcf2728e1cf2cfe6a5f4310e4d42114a404;hpb=0c61221b46addec50e2406e04af44a7d460443d4;p=lilypond.git diff --git a/lily/warn-scheme.cc b/lily/warn-scheme.cc index 9e140dcf27..fe6729d112 100644 --- a/lily/warn-scheme.cc +++ b/lily/warn-scheme.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1998--2011 Jan Nieuwenhuizen + Copyright (C) 1998--2015 Jan Nieuwenhuizen Han-Wen Nienhuys LilyPond is free software: you can redistribute it and/or modify @@ -26,6 +26,8 @@ #include "international.hh" #include "warn.hh" +using std::string; + /* Error / warning / progress / debug message output functions */ @@ -127,7 +129,7 @@ LY_DEFINE (ly_expect_warning, "ly:expect-warning", 1, 0, 1, (SCM str, SCM rest), "A Scheme callable function to register a warning to be expected" " and subsequently suppressed. If the warning is not encountered," - " a warning about the missing warning will be shown. The message" + " a warning about the missing warning will be shown. The message" " should be translated with @code{(_ ...)} and changing parameters" " given after the format string.") {