fly/flightgear
1
0
Fork 0
Code Activity

Irix MIPS patches.

Browse source
This commit is contained in:
curt 2001-03-26 18:22:31 +00:00
parent f1b1077d93
commit 96a9152b02
13 changed files with 38 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/Cockpit/steam.cxx
View file

@ -23,11 +23,9 @@
# include <config.h> # include <config.h>
#endif #endif
#if defined( SG_HAVE_NATIVE_SGI_COMPILERS ) #include <simgear/compiler.h>
# include <iostream.h>
#else #include STL_IOSTREAM
# include <iostream>
#endif
#include <simgear/constants.h> #include <simgear/constants.h>
#include <simgear/math/sg_types.hxx> #include <simgear/math/sg_types.hxx>

10
src/FDM/IO360.cxx
View file

@ -89,13 +89,17 @@
#include <simgear/compiler.h> #include <simgear/compiler.h>
#include <iostream>
#include <fstream>
#include <math.h> #include <math.h>
#include STL_FSTREAM
#include STL_IOSTREAM
#if !defined(SG_HAVE_NATIVE_SGI_COMPILERS)
SG_USING_STD(cout);
#endif
#include "IO360.hxx" #include "IO360.hxx"
SG_USING_STD(cout);
// Static utility functions // Static utility functions

7
src/FDM/IO360.hxx
View file

@ -52,11 +52,14 @@
#include <simgear/compiler.h> #include <simgear/compiler.h>
#include <iostream>
#include <fstream>
#include <math.h> #include <math.h>
#include STL_IOSTREAM
#include STL_FSTREAM
#if !defined(SG_HAVE_NATIVE_SGI_COMPILERS)
SG_USING_STD(ofstream); SG_USING_STD(ofstream);
#endif
class FGNewEngine { class FGNewEngine {

4
src/FDM/LaRCsimIC.cxx
View file

@ -28,7 +28,7 @@
#include <simgear/compiler.h> #include <simgear/compiler.h>
#include <math.h> #include <math.h>
#include <iostream> #include STL_IOSTREAM
#include "FDM/LaRCsimIC.hxx" #include "FDM/LaRCsimIC.hxx"
#include <FDM/LaRCsim/ls_cockpit.h> #include <FDM/LaRCsim/ls_cockpit.h>
@ -38,8 +38,10 @@
#include <FDM/LaRCsim/ls_constants.h> #include <FDM/LaRCsim/ls_constants.h>
#include <FDM/LaRCsim/ls_geodesy.h> #include <FDM/LaRCsim/ls_geodesy.h>
#if !defined(SG_HAVE_NATIVE_SGI_COMPILERS)
SG_USING_STD(cout); SG_USING_STD(cout);
SG_USING_STD(endl); SG_USING_STD(endl);
#endif
LaRCsimIC::LaRCsimIC(void) { LaRCsimIC::LaRCsimIC(void) {

5
src/FDM/ps-10520c.cxx
View file

@ -51,11 +51,14 @@
#include <simgear/compiler.h> #include <simgear/compiler.h>
#include <iostream>
#include <math.h> #include <math.h>
#include STL_IOSTREAM
#if !defined(SG_HAVE_NATIVE_SGI_COMPILERS)
SG_USING_STD(cout); SG_USING_STD(cout);
SG_USING_STD(endl); SG_USING_STD(endl);
#endif
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
// CODE // CODE

2
src/Joystick/joystick.cxx
View file

@ -43,7 +43,9 @@
#include "joystick.hxx" #include "joystick.hxx"
SG_USING_STD(string); SG_USING_STD(string);
#if !defined(SG_HAVE_NATIVE_SGI_COMPILERS)
SG_USING_STD(cout); SG_USING_STD(cout);
#endif
#ifdef WIN32 #ifdef WIN32
static const int MAX_JOYSTICKS = 2; static const int MAX_JOYSTICKS = 2;

8
src/Navaids/fixlist.cxx
View file

@ -61,10 +61,10 @@ bool FGFixList::init( SGPath path ) {
#ifdef __MWERKS__ #ifdef __MWERKS__
char c = 0; 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.putback(c);
in >> fix; in >> fix;
if ( fix.get_ident() != "[End]" ) { if ( fix.get_ident() != (string)"[End]" ) {
fixlist[fix.get_ident()] = fix; fixlist[fix.get_ident()] = fix;
} }
in >> skipcomment; in >> skipcomment;
@ -72,7 +72,7 @@ bool FGFixList::init( SGPath path ) {
#else #else
while ( ! in.eof() && fix.get_ident() != "[End]" ) { while ( ! in.eof() && fix.get_ident() != (string)"[End]" ) {
in >> fix; in >> fix;
/* cout << "id = " << n.get_ident() << endl; /* cout << "id = " << n.get_ident() << endl;
cout << " type = " << n.get_type() << endl; cout << " type = " << n.get_type() << endl;
@ -81,7 +81,7 @@ bool FGFixList::init( SGPath path ) {
cout << " elev = " << n.get_elev() << endl; cout << " elev = " << n.get_elev() << endl;
cout << " freq = " << n.get_freq() << endl; cout << " freq = " << n.get_freq() << endl;
cout << " range = " << n.get_range() << endl; */ cout << " range = " << n.get_range() << endl; */
if ( fix.get_ident() != "[End]" ) { if ( fix.get_ident() != (string)"[End]" ) {
fixlist[fix.get_ident()] = fix; fixlist[fix.get_ident()] = fix;
} }
in >> skipcomment; in >> skipcomment;

2
src/Network/atlas.cxx
View file

@ -443,7 +443,7 @@ bool FGAtlas::parse_message() {
string alt_units = msg.substr(begin, end - begin); string alt_units = msg.substr(begin, end - begin);
begin = end + 1; begin = end + 1;
if ( alt_units != "F" ) { if ( alt_units != (string)"F" ) {
altitude *= SG_METER_TO_FEET; altitude *= SG_METER_TO_FEET;
} }

2
src/Network/garmin.cxx
View file

@ -324,7 +324,7 @@ bool FGGarmin::parse_message() {
string alt_units = msg.substr(begin, end - begin); string alt_units = msg.substr(begin, end - begin);
begin = end + 1; begin = end + 1;
if ( alt_units != "F" && alt_units != "f" ) { if ( alt_units != (string)"F" && alt_units != (string)"f" ) {
altitude *= SG_METER_TO_FEET; altitude *= SG_METER_TO_FEET;
} }

2
src/Network/nmea.cxx
View file

@ -427,7 +427,7 @@ bool FGNMEA::parse_message() {
string alt_units = msg.substr(begin, end - begin); string alt_units = msg.substr(begin, end - begin);
begin = end + 1; begin = end + 1;
if ( alt_units != "F" ) { if ( alt_units != (string)"F" ) {
altitude *= SG_METER_TO_FEET; altitude *= SG_METER_TO_FEET;
} }

4
src/Network/props.cxx
View file

@ -31,12 +31,14 @@
#include <stdlib.h> // atoi() atof() #include <stdlib.h> // atoi() atof()
#include <strstream> #include STL_STRSTREAM
#include "props.hxx" #include "props.hxx"
#if !defined(SG_HAVE_NATIVE_SGI_COMPILERS)
SG_USING_STD(cout); SG_USING_STD(cout);
SG_USING_STD(istrstream); SG_USING_STD(istrstream);
#endif
FGProps::FGProps() { FGProps::FGProps() {
} }

8
src/NetworkOLK/features.cxx
View file

@ -23,11 +23,9 @@
# include <config.h> # include <config.h>
#endif #endif
#if defined( SG_HAVE_NATIVE_SGI_COMPILERS ) #include <simgear/compiler.h>
# include <iostream.h>
#else #include STL_IOSTREAM
# include <iostream>
#endif
#include <simgear/math/sg_types.hxx> #include <simgear/math/sg_types.hxx>

2
src/Scenery/newcache.cxx
View file

@ -218,7 +218,7 @@ void FGNewCache::fill_in( const SGBucket& b ) {
e->tile_bucket = b; e->tile_bucket = b;
SGPath tile_path; SGPath tile_path;
if ( globals->get_fg_scenery() != "" ) { if ( globals->get_fg_scenery() != (string)"" ) {
tile_path.set( globals->get_fg_scenery() ); tile_path.set( globals->get_fg_scenery() );
} else { } else {
tile_path.set( globals->get_fg_root() ); tile_path.set( globals->get_fg_root() );