Irix MIPS patches.

diff --git a/src/Cockpit/steam.cxx b/src/Cockpit/steam.cxx
index 5716b16d9d66dd9d79ab106a7a70ec23ad2cb3ac..c312bf5aafa7e33eb928875c4dcd8153a4298f93 100644 (file)
--- a/src/Cockpit/steam.cxx
+++ b/src/Cockpit/steam.cxx
@@ -23,11 +23,9 @@
 #  include <config.h>
 #endif
 
-#if defined( SG_HAVE_NATIVE_SGI_COMPILERS )
-#  include <iostream.h>
-#else
-#  include <iostream>
-#endif
+#include <simgear/compiler.h>
+
+#include STL_IOSTREAM
 
 #include <simgear/constants.h>
 #include <simgear/math/sg_types.hxx>

diff --git a/src/FDM/IO360.cxx b/src/FDM/IO360.cxx
index 5a99294bd27b4fb25c37664ea8122f4d6623f748..68687ef81b8a519edc167ed9abe157afa4074c68 100644 (file)
--- a/src/FDM/IO360.cxx
+++ b/src/FDM/IO360.cxx
@@ -89,13 +89,17 @@
 
 #include <simgear/compiler.h>
 
-#include <iostream>
-#include <fstream>
 #include <math.h>
 
-#include "IO360.hxx"
+#include STL_FSTREAM
+#include STL_IOSTREAM
 
+#if !defined(SG_HAVE_NATIVE_SGI_COMPILERS)
 SG_USING_STD(cout);
+#endif
+
+#include "IO360.hxx"
+
 
 // Static utility functions
 

diff --git a/src/FDM/IO360.hxx b/src/FDM/IO360.hxx
index de40ec730f7ada0db40c17e9d63137927ee7d583..7f8eaaa6e371d625a04fb4624e3d083cecf3a8f5 100644 (file)
--- a/src/FDM/IO360.hxx
+++ b/src/FDM/IO360.hxx
@@ -52,11 +52,14 @@
 
 #include <simgear/compiler.h>
 
-#include <iostream>
-#include <fstream>
 #include <math.h>
 
+#include STL_IOSTREAM
+#include STL_FSTREAM
+
+#if !defined(SG_HAVE_NATIVE_SGI_COMPILERS)
 SG_USING_STD(ofstream);
+#endif
 
 class FGNewEngine {
 

diff --git a/src/FDM/LaRCsimIC.cxx b/src/FDM/LaRCsimIC.cxx
index 4bd86309df4a35fc5b6fba6212fb2d08f276c9d3..5ec1db499a3021e9e5e7261e87d5a5e307d97797 100644 (file)
--- a/src/FDM/LaRCsimIC.cxx
+++ b/src/FDM/LaRCsimIC.cxx
@@ -28,7 +28,7 @@
 #include <simgear/compiler.h>
 
 #include <math.h>
-#include <iostream>
+#include STL_IOSTREAM
 
 #include "FDM/LaRCsimIC.hxx"
 #include <FDM/LaRCsim/ls_cockpit.h>
@@ -38,8 +38,10 @@
 #include <FDM/LaRCsim/ls_constants.h>
 #include <FDM/LaRCsim/ls_geodesy.h>
 
+#if !defined(SG_HAVE_NATIVE_SGI_COMPILERS)
 SG_USING_STD(cout);
 SG_USING_STD(endl);
+#endif
 
 
 LaRCsimIC::LaRCsimIC(void) {

diff --git a/src/FDM/ps-10520c.cxx b/src/FDM/ps-10520c.cxx
index fc198697e63975fe2b26fc78daed701c85aeb9cd..b67b8e8f92a347f84d1ae473f1b8ecd23172276e 100644 (file)
--- a/src/FDM/ps-10520c.cxx
+++ b/src/FDM/ps-10520c.cxx
@@ -51,11 +51,14 @@
 
 #include <simgear/compiler.h>
 
-#include <iostream>
 #include <math.h>
 
+#include STL_IOSTREAM
+
+#if !defined(SG_HAVE_NATIVE_SGI_COMPILERS)
 SG_USING_STD(cout);
 SG_USING_STD(endl);
+#endif
 
 // ------------------------------------------------------------------------
 // CODE

diff --git a/src/Joystick/joystick.cxx b/src/Joystick/joystick.cxx
index 36404f6c6d9eda203838a738dcbd3001648161b5..7167eb4e15c76293417a792fc44ef18218ea8cbd 100644 (file)
--- a/src/Joystick/joystick.cxx
+++ b/src/Joystick/joystick.cxx
@@ -43,7 +43,9 @@
 #include "joystick.hxx"
 
 SG_USING_STD(string);
+#if !defined(SG_HAVE_NATIVE_SGI_COMPILERS)
 SG_USING_STD(cout);
+#endif
 
 #ifdef WIN32
 static const int MAX_JOYSTICKS = 2;

diff --git a/src/Navaids/fixlist.cxx b/src/Navaids/fixlist.cxx
index f1dfedf9f8bf75ec18d40390dabed981c79cf608..5d57794a8d85ac09c0a93c5a39b719f02e695d94 100644 (file)
--- a/src/Navaids/fixlist.cxx
+++ b/src/Navaids/fixlist.cxx
@@ -61,10 +61,10 @@ bool FGFixList::init( SGPath path ) {
 #ifdef __MWERKS__
 
     char c = 0;
-    while ( in.get(c) && c != '\0' && fix.get_ident() != "[End]" ) {
+    while ( in.get(c) && c != '\0' && fix.get_ident() != (string)"[End]" ) {
         in.putback(c);
         in >> fix;
-       if ( fix.get_ident() != "[End]" ) {
+       if ( fix.get_ident() != (string)"[End]" ) {
            fixlist[fix.get_ident()] = fix;
        }
         in >> skipcomment;
@@ -72,7 +72,7 @@ bool FGFixList::init( SGPath path ) {
 
 #else
 
-    while ( ! in.eof() && fix.get_ident() != "[End]" ) {
+    while ( ! in.eof() && fix.get_ident() != (string)"[End]" ) {
         in >> fix;
        /* cout << "id = " << n.get_ident() << endl;
        cout << " type = " << n.get_type() << endl;
@@ -81,7 +81,7 @@ bool FGFixList::init( SGPath path ) {
        cout << " elev = " << n.get_elev() << endl;
        cout << " freq = " << n.get_freq() << endl;
        cout << " range = " << n.get_range() << endl; */
-       if ( fix.get_ident() != "[End]" ) {
+       if ( fix.get_ident() != (string)"[End]" ) {
            fixlist[fix.get_ident()] = fix;
        }
         in >> skipcomment;

diff --git a/src/Network/atlas.cxx b/src/Network/atlas.cxx
index ea75d22b19e7225a04d63d519859c847b8841351..d2bb4033db2ccaec80b374f6aca8506cb642cced 100644 (file)
--- a/src/Network/atlas.cxx
+++ b/src/Network/atlas.cxx
@@ -443,7 +443,7 @@ bool FGAtlas::parse_message() {
            string alt_units = msg.substr(begin, end - begin);
            begin = end + 1;
 
-           if ( alt_units != "F" ) {
+           if ( alt_units != (string)"F" ) {
                altitude *= SG_METER_TO_FEET;
            }
 

diff --git a/src/Network/garmin.cxx b/src/Network/garmin.cxx
index 5d53876a15db0322704318c8c6ba9d588fa23c6e..45e03c66c211c8e9193fcc54df837c811d8a1dd3 100644 (file)
--- a/src/Network/garmin.cxx
+++ b/src/Network/garmin.cxx
@@ -324,7 +324,7 @@ bool FGGarmin::parse_message() {
            string alt_units = msg.substr(begin, end - begin);
            begin = end + 1;
 
-           if ( alt_units != "F" && alt_units != "f" ) {
+           if ( alt_units != (string)"F" && alt_units != (string)"f" ) {
                altitude *= SG_METER_TO_FEET;
            }
 

diff --git a/src/Network/nmea.cxx b/src/Network/nmea.cxx
index d33578a4a8ae0e0d8887d19cece78474637d9306..d6c9726e135b774f5c581b20677aef05c905a3b4 100644 (file)
--- a/src/Network/nmea.cxx
+++ b/src/Network/nmea.cxx
@@ -427,7 +427,7 @@ bool FGNMEA::parse_message() {
            string alt_units = msg.substr(begin, end - begin);
            begin = end + 1;
 
-           if ( alt_units != "F" ) {
+           if ( alt_units != (string)"F" ) {
                altitude *= SG_METER_TO_FEET;
            }
 

diff --git a/src/Network/props.cxx b/src/Network/props.cxx
index 482ea18dd3b9cf1efe6fbf7304d2275647785d8d..43f3d8184ef5085b4bdb083dabd8b57c8f084890 100644 (file)
--- a/src/Network/props.cxx
+++ b/src/Network/props.cxx
@@ -31,12 +31,14 @@
 
 #include <stdlib.h>            // atoi() atof()
 
-#include <strstream>
+#include STL_STRSTREAM
 
 #include "props.hxx"
 
+#if !defined(SG_HAVE_NATIVE_SGI_COMPILERS)
 SG_USING_STD(cout);
 SG_USING_STD(istrstream);
+#endif
 
 FGProps::FGProps() {
 }

diff --git a/src/NetworkOLK/features.cxx b/src/NetworkOLK/features.cxx
index bc1df0b1ae988d222d175a251f1f8b3315d6f168..e5b44c6661f2e54a67f440214d64ef32024e496d 100644 (file)
--- a/src/NetworkOLK/features.cxx
+++ b/src/NetworkOLK/features.cxx
@@ -23,11 +23,9 @@
 #  include <config.h>
 #endif
 
-#if defined( SG_HAVE_NATIVE_SGI_COMPILERS )
-#  include <iostream.h>
-#else
-#  include <iostream>
-#endif
+#include <simgear/compiler.h>
+
+#include STL_IOSTREAM
 
 #include <simgear/math/sg_types.hxx>
 

diff --git a/src/Scenery/newcache.cxx b/src/Scenery/newcache.cxx
index 23a990a743b28649f876e546f15327f5e9fa1502..a6713fd2fbcee9094b7004cebcc8c5292b390766 100644 (file)
--- a/src/Scenery/newcache.cxx
+++ b/src/Scenery/newcache.cxx
@@ -218,7 +218,7 @@ void FGNewCache::fill_in( const SGBucket& b ) {
     e->tile_bucket = b;
 
     SGPath tile_path;
-    if ( globals->get_fg_scenery() != "" ) {
+    if ( globals->get_fg_scenery() != (string)"" ) {
        tile_path.set( globals->get_fg_scenery() );
     } else {
        tile_path.set( globals->get_fg_root() );