fly/flightgear
1
0
Fork 0
Code Activity

Fixed some IRIX compile warnings and errors.

Browse source
This commit is contained in:
curt 1999-06-01 21:17:36 +00:00
parent 70505137eb
commit d8130925f1
4 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
Simulator/FDM/JSBsim/FGAircraft.cpp
View file

@ -201,8 +201,8 @@ bool FGAircraft::LoadAircraftEx(string aircraft_path, string engine_path, string
while (!aircraftfile.fail()) { while (!aircraftfile.fail()) {
holding_string.erase(); holding_string.erase();
aircraftfile >> holding_string; aircraftfile >> holding_string;
if (holding_string.compare("//",0,2) != 0) { // if (holding_string.compare("//",0,2) != 0) {
// if (holding_string.compare(0, 2, "//") != 0) { if ( !(holding_string.substr(0, 2) == "//") ) {
if (holding_string == "AIRCRAFT") { if (holding_string == "AIRCRAFT") {
cout << "Reading in Aircraft parameters ..." << endl; cout << "Reading in Aircraft parameters ..." << endl;
@ -273,7 +273,7 @@ bool FGAircraft::LoadAircraftEx(string aircraft_path, string engine_path, string
aircraftfile >> tag; aircraftfile >> tag;
streampos gpos = aircraftfile.tellg(); streampos gpos = aircraftfile.tellg();
aircraftfile >> tag; aircraftfile >> tag;
if (tag != "}" ) { if ( !(tag == "}") ) {
aircraftfile.seekg(gpos); aircraftfile.seekg(gpos);
Coeff[LiftCoeff][coeff_ctr[LiftCoeff]] = new FGCoefficient(FDMExec, aircraftfile); Coeff[LiftCoeff][coeff_ctr[LiftCoeff]] = new FGCoefficient(FDMExec, aircraftfile);
coeff_ctr[LiftCoeff]++; coeff_ctr[LiftCoeff]++;
@ -287,7 +287,7 @@ bool FGAircraft::LoadAircraftEx(string aircraft_path, string engine_path, string
aircraftfile >> tag; aircraftfile >> tag;
streampos gpos = aircraftfile.tellg(); streampos gpos = aircraftfile.tellg();
aircraftfile >> tag; aircraftfile >> tag;
if (tag != "}" ) { if ( !(tag == "}") ) {
aircraftfile.seekg(gpos); aircraftfile.seekg(gpos);
Coeff[DragCoeff][coeff_ctr[DragCoeff]] = new FGCoefficient(FDMExec, aircraftfile); Coeff[DragCoeff][coeff_ctr[DragCoeff]] = new FGCoefficient(FDMExec, aircraftfile);
coeff_ctr[DragCoeff]++; coeff_ctr[DragCoeff]++;
@ -301,7 +301,7 @@ bool FGAircraft::LoadAircraftEx(string aircraft_path, string engine_path, string
aircraftfile >> tag; aircraftfile >> tag;
streampos gpos = aircraftfile.tellg(); streampos gpos = aircraftfile.tellg();
aircraftfile >> tag; aircraftfile >> tag;
if (tag != "}" ) { if ( !(tag == "}") ) {
aircraftfile.seekg(gpos); aircraftfile.seekg(gpos);
Coeff[SideCoeff][coeff_ctr[SideCoeff]] = new FGCoefficient(FDMExec, aircraftfile); Coeff[SideCoeff][coeff_ctr[SideCoeff]] = new FGCoefficient(FDMExec, aircraftfile);
coeff_ctr[SideCoeff]++; coeff_ctr[SideCoeff]++;
@ -315,7 +315,7 @@ bool FGAircraft::LoadAircraftEx(string aircraft_path, string engine_path, string
aircraftfile >> tag; aircraftfile >> tag;
streampos gpos = aircraftfile.tellg(); streampos gpos = aircraftfile.tellg();
aircraftfile >> tag; aircraftfile >> tag;
if (tag != "}" ) { if ( !(tag == "}") ) {
aircraftfile.seekg(gpos); aircraftfile.seekg(gpos);
Coeff[RollCoeff][coeff_ctr[RollCoeff]] = new FGCoefficient(FDMExec, aircraftfile); Coeff[RollCoeff][coeff_ctr[RollCoeff]] = new FGCoefficient(FDMExec, aircraftfile);
coeff_ctr[RollCoeff]++; coeff_ctr[RollCoeff]++;
@ -329,7 +329,7 @@ bool FGAircraft::LoadAircraftEx(string aircraft_path, string engine_path, string
aircraftfile >> tag; aircraftfile >> tag;
streampos gpos = aircraftfile.tellg(); streampos gpos = aircraftfile.tellg();
aircraftfile >> tag; aircraftfile >> tag;
if (tag != "}" ) { if ( !(tag == "}") ) {
aircraftfile.seekg(gpos); aircraftfile.seekg(gpos);
Coeff[PitchCoeff][coeff_ctr[PitchCoeff]] = new FGCoefficient(FDMExec, aircraftfile); Coeff[PitchCoeff][coeff_ctr[PitchCoeff]] = new FGCoefficient(FDMExec, aircraftfile);
coeff_ctr[PitchCoeff]++; coeff_ctr[PitchCoeff]++;
@ -343,7 +343,7 @@ bool FGAircraft::LoadAircraftEx(string aircraft_path, string engine_path, string
aircraftfile >> tag; aircraftfile >> tag;
streampos gpos = aircraftfile.tellg(); streampos gpos = aircraftfile.tellg();
aircraftfile >> tag; aircraftfile >> tag;
if (tag != "}" ) { if ( !(tag == "}") ) {
aircraftfile.seekg(gpos); aircraftfile.seekg(gpos);
Coeff[YawCoeff][coeff_ctr[YawCoeff]] = new FGCoefficient(FDMExec, aircraftfile); Coeff[YawCoeff][coeff_ctr[YawCoeff]] = new FGCoefficient(FDMExec, aircraftfile);
coeff_ctr[YawCoeff]++; coeff_ctr[YawCoeff]++;
@ -359,6 +359,7 @@ bool FGAircraft::LoadAircraftEx(string aircraft_path, string engine_path, string
} }
} }
cout << "End of Configuration File Parsing." << endl; cout << "End of Configuration File Parsing." << endl;
return true;
} }

2
Simulator/FDM/JSBsim/FGFCS.h
View file

@ -76,4 +76,4 @@ private:
}; };
/******************************************************************************/ /******************************************************************************/
#endif #endif

4
Simulator/FDM/JSBsim/FGFDMExec.h
View file

@ -59,8 +59,8 @@ class FGOutput;
class FGFDMExec class FGFDMExec
{ {
public: public:
FGFDMExec::FGFDMExec(void); FGFDMExec(void);
FGFDMExec::~FGFDMExec(void); ~FGFDMExec(void);
FGModel* FirstModel; FGModel* FirstModel;

2
Simulator/FDM/JSBsim/FGUtility.h
View file

@ -42,7 +42,7 @@ INCLUDES
DEFINES DEFINES
*******************************************************************************/ *******************************************************************************/
using namespace std; // FG_USING_STD(std);
/******************************************************************************* /*******************************************************************************
CLASS DECLARATION CLASS DECLARATION