X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fincludable-lexer.cc;h=3e9c54857dca77f9eede2eae99cce2f3c66c0b81;hb=0e91bb16e020081fbbecab38fb7a8ed1c1a761dd;hp=15d52a3ae9b50368536bf60a38fc967053d23bad;hpb=a066a93ee74edebb9d238a1bac93c3bc7e8e6e4a;p=lilypond.git

diff --git a/lily/includable-lexer.cc b/lily/includable-lexer.cc
index 15d52a3ae9..3e9c54857d 100644
--- a/lily/includable-lexer.cc
+++ b/lily/includable-lexer.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--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
@@ -20,7 +20,6 @@
 #include "includable-lexer.hh"
 
 #include <sstream>
-using namespace std;
 
 #include "config.hh"
 
@@ -32,6 +31,8 @@ using namespace std;
 #include "sources.hh"
 #include "warn.hh"
 
+using std::string;
+
 #ifndef YY_BUF_SIZE
 #define YY_BUF_SIZE 16384
 #endif
@@ -59,7 +60,7 @@ Includable_lexer::Includable_lexer ()
 
 /** Set the new input file to NAME, remember old file.  */
 void
-Includable_lexer::new_input (string name, Sources *sources)
+Includable_lexer::new_input (const string &name, Sources *sources)
 {
   string current_dir = dir_name (main_input_name_);
   if (relative_includes)
@@ -94,7 +95,7 @@ Includable_lexer::new_input (string name, Sources *sources)
 }
 
 void
-Includable_lexer::new_input (string name, string data, Sources *sources)
+Includable_lexer::new_input (const string &name, string data, Sources *sources)
 {
   Source_file *file = new Source_file (name, data);
   sources->add (file);
@@ -111,12 +112,6 @@ Includable_lexer::new_input (string name, string data, Sources *sources)
   yy_switch_to_buffer (yy_create_buffer (file->get_istream (), YY_BUF_SIZE));
 }
 
-void
-Includable_lexer::add_string_include (string data)
-{
-  pending_string_includes_.push_back (data);
-}
-
 /** pop the inputstack.  conceptually this is a destructor, but it
     does not destruct the Source_file that Includable_lexer::new_input
     creates.  */