X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fincludable-lexer.hh;h=bfc3d81718904244e7b4638735f9105bb905fdfd;hb=8cf69a467ad7650f5ca9da6fe2dfd4c7c088b239;hp=3c0fe8b9fa75c437aa7b0c7e62ac2dbbcabb6482;hpb=bb8a0a5387af94dd2702877256334b160575a730;p=lilypond.git diff --git a/lily/include/includable-lexer.hh b/lily/include/includable-lexer.hh index 3c0fe8b9fa..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 + Copyright (C) 1997--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 @@ -42,7 +42,6 @@ protected: bool close_input (); vector include_stack_; vector char_count_stack_; - vector pending_string_includes_; public: @@ -54,10 +53,9 @@ public: vector file_name_strings_; Source_file *get_source_file () const; - virtual void new_input (string s, Sources *); + virtual void new_input (const string &s, Sources *); - void new_input (string name, string data, Sources *); - void add_string_include (string data); + void new_input (const string &name, string data, Sources *); char const *here_str0 () const; };