From 53bdf9dac4868419913be11cc842cc9afa808004 Mon Sep 17 00:00:00 2001 From: ehofman Date: Thu, 11 Dec 2003 15:26:23 +0000 Subject: [PATCH] Revert to the previous version --- simgear/compatibility/fstream | 20 -------------------- simgear/compatibility/iostream | 3 +-- 2 files changed, 1 insertion(+), 22 deletions(-) diff --git a/simgear/compatibility/fstream b/simgear/compatibility/fstream index 5757a28f..87bc2975 100644 --- 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 f7273737..25aa0382 100644 --- a/simgear/compatibility/iostream +++ b/simgear/compatibility/iostream @@ -2,10 +2,9 @@ #ifndef __SG_IOSTREAM #define __SG_IOSTREAM 1 -# include - # if defined(sgi) && !defined(__GNUC__) +# include # include class ios_base : public ios { -- 2.39.5