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.

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
 

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
 

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
 

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
 

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