X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fsource-file.hh;h=6b5ccacb04a9a8cd22b36cf162438c9fb5a1e58e;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=05fd73359fe4db7b47145602f97249f874fecf58;hpb=b053638dac19bed7f8d2f8b8b0231b3611c17fde;p=lilypond.git diff --git a/lily/include/source-file.hh b/lily/include/source-file.hh index 05fd73359f..6b5ccacb04 100644 --- a/lily/include/source-file.hh +++ b/lily/include/source-file.hh @@ -3,13 +3,12 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2006 Jan Nieuwenhuizen + (c) 1999--2008 Jan Nieuwenhuizen */ #ifndef SOURCE_FILE_HH #define SOURCE_FILE_HH -#include "flower-proto.hh" #include "std-vector.hh" #include "lily-proto.hh" #include "smobs.hh" @@ -27,17 +26,16 @@ using namespace std; class Source_file { - vector newline_locations_; + vector newline_locations_; istream *istream_; vector characters_; SCM str_port_; - char const *contents_str0 () const; void load_stdin (); void init_port (); void init (); - DECLARE_SMOBS(Source_file, bla); + DECLARE_SMOBS (Source_file); public: Source_file (string fn); Source_file (string, string);