X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fparser.yy;h=87edcdafed7cc33c4cf48e4dc68c4998789e67dd;hb=76ee88f5adfc7bcd8eff487543e3605e43a93d80;hp=cadcd898698ef56b245eed44df0091f0c2a2b9e1;hpb=f127e14af04f474d20406ca0e0f76f05061ee103;p=lilypond.git

diff --git a/lily/parser.yy b/lily/parser.yy
index cadcd89869..87edcdafed 100644
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -141,7 +141,7 @@ using namespace std;
 #include "lily-imports.hh"
 
 void
-Lily_parser::parser_error (Input const *i, Lily_parser *parser, SCM *, const std::string &s)
+Lily_parser::parser_error (Input const *i, Lily_parser *parser, SCM *, const string &s)
 {
 	parser->parser_error (*i, s);
 }
@@ -223,7 +223,6 @@ SCM get_next_unique_lyrics_context_id ();
 #define _(x) gettext (x)
 #endif
 
-using std::string;
 
 static Music *make_music_with_input (SCM name, Input where);
 SCM check_scheme_arg (Lily_parser *parser, Input loc,