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.

diff --git a/simgear/compatibility/fstream b/simgear/compatibility/fstream
index ffe2a0b05a13a603277908780da99b320a99d5c0..0cbd4f4a206d2b074ad8301c3ed1596c742cb926 100644 (file)
--- a/simgear/compatibility/fstream
+++ b/simgear/compatibility/fstream
@@ -3,6 +3,15 @@
 #define __SG_FSTREAM 1
 
 # include <fstream.h>
+# include <iostream>
+
+# if defined(sgi) && !defined(__GNUC__)
+
+  namespace std {
+    using ::fstream;
+  };
+
+# endif
 
 #endif // !__SG_FSTREAM
 

diff --git a/simgear/compatibility/iostream b/simgear/compatibility/iostream
index 36285efbd55db89c53aa9318bd67dbf672027fa6..1bd55f1f4a60522f1937154dbc11afef979d9658 100644 (file)
--- a/simgear/compatibility/iostream
+++ b/simgear/compatibility/iostream
@@ -5,7 +5,7 @@
 # include <iostream.h>
 # include <fstream.h>
 
-#if defined(sgi) && !defined(__GNUC__)
+# if defined(sgi) && !defined(__GNUC__)
 
   class ios_base : public ios {
   public:
@@ -23,7 +23,9 @@
     using ::clog;
     using ::endl;
 
+    using ::ios;
     using ::ios_base;
+    using ::iostream;
     using ::istream;
     using ::ostream;
 
@@ -31,7 +33,7 @@
     using ::ofstream;
   };
 
-#endif
+# endif
 
 #endif // !__SG_IOSTREAM
 

diff --git a/simgear/compatibility/istream b/simgear/compatibility/istream
index b8b5668c53bd9b7235c0aa3a702f657046ae9788..c56afc14937613678d46645d02017f802fca9c8c 100644 (file)
--- a/simgear/compatibility/istream
+++ b/simgear/compatibility/istream
@@ -4,14 +4,14 @@
 
 # include <iostream>
 
-#if defined(sgi) && !defined(__GNUC__)
+# if defined(sgi) && !defined(__GNUC__)
 
 # include <stream.h>
 # include <string>
 
   using std::getline;
 
-#endif
+# endif
 
 #endif // !__SG_ISTREAM
 

diff --git a/simgear/compatibility/streambuf b/simgear/compatibility/streambuf
index bee458f5ebc829d1493c3948b6190101fac22331..1329463add6c329311628fa4b95dabefd5cc8270 100644 (file)
--- a/simgear/compatibility/streambuf
+++ b/simgear/compatibility/streambuf
@@ -23,7 +23,7 @@ public:
 };
 
 
-#if defined(sgi) && !defined(__GNUC__)
+# if defined(sgi) && !defined(__GNUC__)
 
 # define pubsync  sync
 
@@ -32,7 +32,7 @@ public:
     using ::streampos;
     using ::streamoff;
   };
-#endif
+# endif
 
 #endif // !__SG_STREAMBUF
 

diff --git a/simgear/compatibility/strstream b/simgear/compatibility/strstream
index 5a0922eeef40a9b2fdb962b8de3e552d542b2ea6..2c703525c9707e616aaa53715d377ceb1f7e6ece 100644 (file)
--- a/simgear/compatibility/strstream
+++ b/simgear/compatibility/strstream
@@ -4,5 +4,17 @@
 
 # include <strstream.h>
 
+# if defined(sgi) && !defined(__GNUC__)
+
+  namespace std {
+    using ::ends;
+
+    using ::strstream;
+    using ::istrstream;
+    using ::ostrstream;
+  };
+
+# endif
+
 #endif // !__SG_STRSTREAM