Run `make grand-replace'.

[lilypond.git] / lily / include / source-file.hh

diff --git a/lily/include/source-file.hh b/lily/include/source-file.hh
index 76942ba6b168f54d2e1b46b31d4693a02147cba4..6b5ccacb04a9a8cd22b36cf162438c9fb5a1e58e 100644 (file)
--- 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 <janneke@gnu.org>
+  (c) 1999--2008 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #ifndef SOURCE_FILE_HH
 #define SOURCE_FILE_HH
 
-#include "flower-proto.hh"
 #include "std-vector.hh"
 #include "lily-proto.hh"
 #include "smobs.hh"
@@ -27,7 +26,7 @@ using namespace std;
 
 class Source_file
 {
-  vector<char*> newline_locations_;
+  vector<char const*> newline_locations_;
   istream *istream_;
   vector<char> characters_;
   SCM str_port_;
@@ -36,7 +35,7 @@ class Source_file
   void init_port ();
   void init ();
   
-  DECLARE_SMOBS(Source_file, bla);
+  DECLARE_SMOBS (Source_file);
 public:
   Source_file (string fn);
   Source_file (string, string);