improved STL compatibility header files

diff --git a/simgear/compatibility/Makefile.am b/simgear/compatibility/Makefile.am
index 8ab827c69ee8088333270b9890ea6c1c0dc57913..2c0592fe0e00cff5cb2cbca444b81f211a15fcd2 100644 (file)
--- a/simgear/compatibility/Makefile.am
+++ b/simgear/compatibility/Makefile.am
@@ -9,6 +9,7 @@ include_HEADERS = \
        cwchar \
        iostream \
        strstream \
+       sstream \
        cassert \
        climits \
        csignal \

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

diff --git a/simgear/compatibility/iomanip b/simgear/compatibility/iomanip
index 2ebf92cf8fea6138c1017558efd165d2a22f1f26..7c14a42975204de4fc09f421020932eaedd1b795 100644 (file)
--- a/simgear/compatibility/iomanip
+++ b/simgear/compatibility/iomanip
@@ -4,5 +4,9 @@
 
 # include <iomanip.h>
 
+namespace std {
+   using ::setw;
+};
+
 #endif // !__SG_IOMANIP
 

diff --git a/simgear/compatibility/iostream b/simgear/compatibility/iostream
index 1bd55f1f4a60522f1937154dbc11afef979d9658..f93908c20f08c6832c6a640a0382db29ba2624a3 100644 (file)
--- a/simgear/compatibility/iostream
+++ b/simgear/compatibility/iostream
@@ -2,11 +2,12 @@
 #ifndef __SG_IOSTREAM
 #define __SG_IOSTREAM 1
 
-# include <iostream.h>
-# include <fstream.h>
+# include <fstream>
 
 # if defined(sgi) && !defined(__GNUC__)
 
+# include <iostream.h>
+
   class ios_base : public ios {
   public:
 
@@ -29,8 +30,8 @@
     using ::istream;
     using ::ostream;
 
-    using ::ifstream;
-    using ::ofstream;
+    using ::dec;
+    using ::hex;
   };
 
 # endif

diff --git a/simgear/compatibility/sstream b/simgear/compatibility/sstream
new file mode 100644 (file)
index 0000000..6ed18bb
--- /dev/null
+++ b/simgear/compatibility/sstream
@@ -0,0 +1,13 @@
+
+#ifndef __SG_SSTREAM
+#define __SG_SSTREAM 1
+
+# include <strstream>
+
+namespace std {
+   typedef ::ostrstream ostringstream;
+   typedef ::istrstream istringstream;
+};
+
+#endif // !__SG_SSTREAM
+