From: curt Date: Mon, 26 Mar 2001 18:22:31 +0000 (+0000) Subject: Irix MIPS patches. X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=96a9152b0254d17a6cc51b31c7e0277aec270c5e;p=flightgear.git Irix MIPS patches. --- diff --git a/src/Cockpit/steam.cxx b/src/Cockpit/steam.cxx index 5716b16d9..c312bf5aa 100644 --- a/src/Cockpit/steam.cxx +++ b/src/Cockpit/steam.cxx @@ -23,11 +23,9 @@ # include #endif -#if defined( SG_HAVE_NATIVE_SGI_COMPILERS ) -# include -#else -# include -#endif +#include + +#include STL_IOSTREAM #include #include diff --git a/src/FDM/IO360.cxx b/src/FDM/IO360.cxx index 5a99294bd..68687ef81 100644 --- a/src/FDM/IO360.cxx +++ b/src/FDM/IO360.cxx @@ -89,13 +89,17 @@ #include -#include -#include #include -#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 de40ec730..7f8eaaa6e 100644 --- a/src/FDM/IO360.hxx +++ b/src/FDM/IO360.hxx @@ -52,11 +52,14 @@ #include -#include -#include #include +#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 4bd86309d..5ec1db499 100644 --- a/src/FDM/LaRCsimIC.cxx +++ b/src/FDM/LaRCsimIC.cxx @@ -28,7 +28,7 @@ #include #include -#include +#include STL_IOSTREAM #include "FDM/LaRCsimIC.hxx" #include @@ -38,8 +38,10 @@ #include #include +#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 fc198697e..b67b8e8f9 100644 --- a/src/FDM/ps-10520c.cxx +++ b/src/FDM/ps-10520c.cxx @@ -51,11 +51,14 @@ #include -#include #include +#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 36404f6c6..7167eb4e1 100644 --- 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 f1dfedf9f..5d57794a8 100644 --- 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 ea75d22b1..d2bb4033d 100644 --- 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 5d53876a1..45e03c66c 100644 --- 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 d33578a4a..d6c9726e1 100644 --- 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 482ea18dd..43f3d8184 100644 --- a/src/Network/props.cxx +++ b/src/Network/props.cxx @@ -31,12 +31,14 @@ #include // atoi() atof() -#include +#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 bc1df0b1a..e5b44c666 100644 --- a/src/NetworkOLK/features.cxx +++ b/src/NetworkOLK/features.cxx @@ -23,11 +23,9 @@ # include #endif -#if defined( SG_HAVE_NATIVE_SGI_COMPILERS ) -# include -#else -# include -#endif +#include + +#include STL_IOSTREAM #include diff --git a/src/Scenery/newcache.cxx b/src/Scenery/newcache.cxx index 23a990a74..a6713fd2f 100644 --- 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() );