Merge branch 'timoore/effects-anim-rebase' into next

[simgear.git] / simgear / io / iochannel.hxx

diff --git a/simgear/io/iochannel.hxx b/simgear/io/iochannel.hxx
index ee43aa64ff35a7d785cf4e28f961463673d1f42c..d8a29608db20b2dbef3e6b2974bcce3881ab709a 100644 (file)
--- a/simgear/io/iochannel.hxx
+++ b/simgear/io/iochannel.hxx
@@ -5,7 +5,7 @@
 
 // Written by Curtis Olson, started November 1999.
 //
-// Copyright (C) 1999  Curtis L. Olson - curt@flightgear.org
+// Copyright (C) 1999  Curtis L. Olson - http://www.flightgear.org/~curt
 //
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License as
@@ -19,7 +19,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 // $Id$
 
@@ -32,11 +32,11 @@
 
 // #include "protocol.hxx"
 
-#include STL_STRING
+#include <string>
 #include <vector>
 
-SG_USING_STD(vector);
-SG_USING_STD(string);
+using std::vector;
+using std::string;
 
 
 #define SG_IO_MAX_MSG_SIZE 16384
@@ -152,6 +152,14 @@ public:
      */
     virtual bool close();
 
+    /**
+     * The eof() method returns true if end of file has been reached
+     * in a context where that makes sense.  Otherwise it returns
+     * false.
+     * @return result of eof check
+     */
+    virtual bool eof();
+
     inline void set_type( SGChannelType t ) { type = t; }
     inline SGChannelType get_type() const { return type; }