GCC-3.1.1 fixes

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

diff --git a/flower/include/source-file.hh b/flower/include/source-file.hh
index f8a3e4a0369b467f3839957353ae565dea70115e..777213267de0d6b88078f8b92fdfda7acaf78f49 100644 (file)
--- a/flower/include/source-file.hh
+++ b/flower/include/source-file.hh
@@ -6,13 +6,12 @@
 #ifndef SOURCE_FILE_HH
 #define SOURCE_FILE_HH
 
+#include <iostream>
+
 #include "flower-proto.hh"
 #include "string.hh"
 #include "interval.hh"
 
-class istream;
-
-
 /**
   class for reading and mapping a file. 
 
@@ -33,7 +32,7 @@ public:
 
   char const* ch_C () const;
   virtual String error_str (char const* pos_ch_C ) const;
-  istream * istream_l ();
+  std::istream * istream_l ();
   bool in_b (char const* pos_ch_C ) const;
   int length_i () const;
   virtual int line_i (char const* pos_ch_C ) const;
@@ -47,24 +46,20 @@ public:
   char const* pos_ch_C () { return pos_ch_C_; }
   String get_str (int n);
   void set_pos (char const * pos_ch_C);
-  
-  // tbd
-  // String get_line ();
-  // String get_word ();
-  // only used in binary-source-file, currently
-
-
 public:
   Slice line_slice (char const* pos_ch_C) const;
   String line_str (char const* pos_ch_C) const;
   int column_i (char const* pos_ch_C) const;
   int char_i (char const* pos_ch_C) const;
 
+  /*
+    DOCUMENT-ME
+   */
   char const* pos_ch_C_;
 
 private:
   String name_str_;
-  istream* istream_p_;
+  std::istream* istream_p_;
   File_storage * storage_p_;
 };