X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fincludable-lexer.hh;h=bfc3d81718904244e7b4638735f9105bb905fdfd;hb=d2762a4f1add2bb04d6fc34d3c7ae03eeb7d500f;hp=a7ca04ca24cffff02a12349047444a6dccc447c9;hpb=1c846b2c2348b4e0ca4a3c2e8fb267047ba2d203;p=lilypond.git

diff --git a/lily/include/includable-lexer.hh b/lily/include/includable-lexer.hh
index a7ca04ca24..bfc3d81718 100644
--- a/lily/include/includable-lexer.hh
+++ b/lily/include/includable-lexer.hh
@@ -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
@@ -40,9 +40,8 @@ class Includable_lexer : public yyFlexLexer
 
 protected:
   bool close_input ();
-  vector<Source_file*> include_stack_;
+  vector<Source_file *> include_stack_;
   vector<int> char_count_stack_;
-  vector<string> pending_string_includes_;
 
 public:
 
@@ -54,11 +53,10 @@ public:
   vector<string> file_name_strings_;
 
   Source_file *get_source_file () const;
-  virtual void new_input (string s, Sources *);
-  
-  void new_input (string name, string data, Sources *);
-  void add_string_include (string data);
-  
+  virtual void new_input (const string &s, Sources *);
+
+  void new_input (const string &name, string data, Sources *);
+
   char const *here_str0 () const;
 };