From: david <david>
Date: Tue, 31 Dec 2002 18:03:26 +0000 (+0000)
Subject: Patches from Erik Hofman for SGI compatibility:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=6cf3b54b4b924e6a4308001a34cf2cf276d35600;p=simgear.git

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 ffe2a0b0..0cbd4f4a 100644
--- 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 36285efb..1bd55f1f 100644
--- 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 b8b5668c..c56afc14 100644
--- 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 bee458f5..1329463a 100644
--- 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 5a0922ee..2c703525 100644
--- 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