Revert to the previous version

diff --git a/simgear/compatibility/fstream b/simgear/compatibility/fstream
index 5757a28f9de983a04fdf581853ddd905746d7c1b..87bc29755392806e10d6d9974f8f02080adec496 100644 (file)
--- a/simgear/compatibility/fstream
+++ b/simgear/compatibility/fstream
@@ -9,27 +9,7 @@
   namespace std {
     using ::fstream;
     using ::ofstream;
-
-# ifdef SG_HAVE_NATIVE_SGI_COMPILERS
     using ::ifstream;
-# else
-    class ifstream : public ::ifstream {
-    private:
-       ::ifstream *ifs;
-    public:
-       ifstream() { ifs = new ::ifstream(); }
-       ifstream(int fd) { ifs = new ::ifstream(fd); }
-       ifstream(int fd, char*  p, int l) { ifs = new ::ifstream(fd, p, l); }
-       ifstream(const char* name, int mode=ios::in, int prot=filebuf::openprot)
-          { ifs = new ::ifstream(name, mode, prot); };
-       ~ifstream() { delete ifs; }
-
-       filebuf* rdbuf() { return ifs->rdbuf(); }
-       void open(const char* name, int mode=ios::in, int prot=filebuf::openprot)
-          { ifs->open(name, mode, prot); }
-       int is_open() { return (!ifs->fail() && !ifs->eof()); }
-    };
-# endif
   };
 
 

diff --git a/simgear/compatibility/iostream b/simgear/compatibility/iostream
index f727373791727d98f1b4fc8c2b3a059f7655fae9..25aa0382ce0994678461163d4c81e4cdf67edbd4 100644 (file)
--- a/simgear/compatibility/iostream
+++ b/simgear/compatibility/iostream
@@ -2,10 +2,9 @@
 #ifndef __SG_IOSTREAM
 #define __SG_IOSTREAM 1
 
-# include <fstream>
-
 # if defined(sgi) && !defined(__GNUC__)
 
+# include <fstream>
 # include <iostream.h>
 
   class ios_base : public ios {