Patches from Erik Hofman for SGI compatibility:

Some more cmall changes to the SimGear header files and removed the
SG_HAVE_NATIVE_SGI_COMPILERS dependancies from FlightGear.

I've added a seperate JSBSim patch for the JSBSim source tree.
This commit is contained in:
david 2002-12-31 18:03:26 +00:00
parent 78411d29a7
commit 6cf3b54b4b
5 changed files with 29 additions and 6 deletions

View File

@ -3,6 +3,15 @@
#define __SG_FSTREAM 1 #define __SG_FSTREAM 1
# include <fstream.h> # include <fstream.h>
# include <iostream>
# if defined(sgi) && !defined(__GNUC__)
namespace std {
using ::fstream;
};
# endif
#endif // !__SG_FSTREAM #endif // !__SG_FSTREAM

View File

@ -5,7 +5,7 @@
# include <iostream.h> # include <iostream.h>
# include <fstream.h> # include <fstream.h>
#if defined(sgi) && !defined(__GNUC__) # if defined(sgi) && !defined(__GNUC__)
class ios_base : public ios { class ios_base : public ios {
public: public:
@ -23,7 +23,9 @@
using ::clog; using ::clog;
using ::endl; using ::endl;
using ::ios;
using ::ios_base; using ::ios_base;
using ::iostream;
using ::istream; using ::istream;
using ::ostream; using ::ostream;
@ -31,7 +33,7 @@
using ::ofstream; using ::ofstream;
}; };
#endif # endif
#endif // !__SG_IOSTREAM #endif // !__SG_IOSTREAM

View File

@ -4,14 +4,14 @@
# include <iostream> # include <iostream>
#if defined(sgi) && !defined(__GNUC__) # if defined(sgi) && !defined(__GNUC__)
# include <stream.h> # include <stream.h>
# include <string> # include <string>
using std::getline; using std::getline;
#endif # endif
#endif // !__SG_ISTREAM #endif // !__SG_ISTREAM

View File

@ -23,7 +23,7 @@ public:
}; };
#if defined(sgi) && !defined(__GNUC__) # if defined(sgi) && !defined(__GNUC__)
# define pubsync sync # define pubsync sync
@ -32,7 +32,7 @@ public:
using ::streampos; using ::streampos;
using ::streamoff; using ::streamoff;
}; };
#endif # endif
#endif // !__SG_STREAMBUF #endif // !__SG_STREAMBUF

View File

@ -4,5 +4,17 @@
# include <strstream.h> # include <strstream.h>
# if defined(sgi) && !defined(__GNUC__)
namespace std {
using ::ends;
using ::strstream;
using ::istrstream;
using ::ostrstream;
};
# endif
#endif // !__SG_STRSTREAM #endif // !__SG_STRSTREAM