Compiler warning fixes and small updates
This commit is contained in:
parent
cb8b72744c
commit
01be2ed8e4
6 changed files with 21 additions and 20 deletions
|
@ -35,7 +35,7 @@
|
|||
#include <string>
|
||||
SG_USING_STD(string);
|
||||
|
||||
typedef enum PatternLeg {
|
||||
enum PatternLeg {
|
||||
TAKEOFF_ROLL,
|
||||
CLIMBOUT,
|
||||
TURN1,
|
||||
|
@ -49,20 +49,20 @@ typedef enum PatternLeg {
|
|||
LANDING_ROLL
|
||||
};
|
||||
|
||||
typedef enum TaxiState {
|
||||
enum TaxiState {
|
||||
TD_INBOUND,
|
||||
TD_OUTBOUND,
|
||||
TD_NONE
|
||||
};
|
||||
|
||||
typedef enum OperatingState {
|
||||
enum OperatingState {
|
||||
IN_PATTERN,
|
||||
TAXIING,
|
||||
PARKED
|
||||
};
|
||||
|
||||
// perhaps we could use an FGRunway instead of this
|
||||
typedef struct RunwayDetails {
|
||||
struct RunwayDetails {
|
||||
Point3D threshold_pos;
|
||||
Point3D end1ortho; // ortho projection end1 (the threshold ATM)
|
||||
Point3D end2ortho; // ortho projection end2 (the take off end in the current hardwired scheme)
|
||||
|
@ -74,7 +74,7 @@ typedef struct RunwayDetails {
|
|||
string rwyID;
|
||||
};
|
||||
|
||||
typedef struct StartofDescent {
|
||||
struct StartofDescent {
|
||||
PatternLeg leg;
|
||||
double orthopos_x;
|
||||
double orthopos_y;
|
||||
|
|
|
@ -43,12 +43,12 @@ SG_USING_STD(list);
|
|||
|
||||
//////////////////////////////////////////////////////
|
||||
// Types for the logical network data structure
|
||||
typedef enum arc_type {
|
||||
enum arc_type {
|
||||
RUNWAY,
|
||||
TAXIWAY
|
||||
};
|
||||
|
||||
typedef enum node_type {
|
||||
enum node_type {
|
||||
GATE,
|
||||
APRON,
|
||||
HOLD,
|
||||
|
@ -70,7 +70,7 @@ enum GateType {
|
|||
OTHER // ie. anything goes!!
|
||||
};
|
||||
|
||||
typedef enum network_element_type {
|
||||
enum network_element_type {
|
||||
NODE,
|
||||
ARC
|
||||
};
|
||||
|
|
|
@ -92,7 +92,7 @@ FGCondition::FGCondition(FGConfigFile* AC_cfg, FGPropertyManager* PropertyManage
|
|||
else if (AC_cfg->GetValue("LOGIC") == "AND") Logic = eAND;
|
||||
|
||||
AC_cfg->GetNextConfigLine();
|
||||
while (AC_cfg->GetValue() != "/CONDITION_GROUP") {
|
||||
while (AC_cfg->GetValue() != string("/CONDITION_GROUP")) {
|
||||
conditions.push_back(*(new FGCondition(AC_cfg, PropertyManager)));
|
||||
}
|
||||
isGroup = true;
|
||||
|
|
|
@ -115,7 +115,7 @@ FGSwitch::FGSwitch(FGFCS* fcs, FGConfigFile* AC_cfg) : FGFCSComponent(fcs),
|
|||
}
|
||||
|
||||
AC_cfg->GetNextConfigLine();
|
||||
while (AC_cfg->GetValue() != "/TEST") {
|
||||
while (AC_cfg->GetValue() != string("/TEST")) {
|
||||
current_test->conditions.push_back(*(new FGCondition(AC_cfg, PropertyManager)));
|
||||
}
|
||||
}
|
||||
|
|
|
@ -448,6 +448,7 @@ FGInterface::unbind ()
|
|||
fgUntie("/orientation/pitch-deg");
|
||||
fgUntie("/orientation/heading-deg");
|
||||
fgUntie("/velocities/airspeed-kt");
|
||||
fgUntie("/velocities/mach");
|
||||
fgUntie("/velocities/speed-north-fps");
|
||||
fgUntie("/velocities/speed-east-fps");
|
||||
fgUntie("/velocities/speed-down-fps");
|
||||
|
|
|
@ -80,56 +80,56 @@ FGSubsystemGroup::FGSubsystemGroup ()
|
|||
|
||||
FGSubsystemGroup::~FGSubsystemGroup ()
|
||||
{
|
||||
for (int i = 0; i < _members.size(); i++)
|
||||
for (unsigned int i = 0; i < _members.size(); i++)
|
||||
delete _members[i];
|
||||
}
|
||||
|
||||
void
|
||||
FGSubsystemGroup::init ()
|
||||
{
|
||||
for (int i = 0; i < _members.size(); i++)
|
||||
for (unsigned int i = 0; i < _members.size(); i++)
|
||||
_members[i]->subsystem->init();
|
||||
}
|
||||
|
||||
void
|
||||
FGSubsystemGroup::reinit ()
|
||||
{
|
||||
for (int i = 0; i < _members.size(); i++)
|
||||
for (unsigned int i = 0; i < _members.size(); i++)
|
||||
_members[i]->subsystem->reinit();
|
||||
}
|
||||
|
||||
void
|
||||
FGSubsystemGroup::bind ()
|
||||
{
|
||||
for (int i = 0; i < _members.size(); i++)
|
||||
for (unsigned int i = 0; i < _members.size(); i++)
|
||||
_members[i]->subsystem->bind();
|
||||
}
|
||||
|
||||
void
|
||||
FGSubsystemGroup::unbind ()
|
||||
{
|
||||
for (int i = 0; i < _members.size(); i++)
|
||||
for (unsigned int i = 0; i < _members.size(); i++)
|
||||
_members[i]->subsystem->unbind();
|
||||
}
|
||||
|
||||
void
|
||||
FGSubsystemGroup::update (double delta_time_sec)
|
||||
{
|
||||
for (int i = 0; i < _members.size(); i++)
|
||||
for (unsigned int i = 0; i < _members.size(); i++)
|
||||
_members[i]->update(delta_time_sec); // indirect call
|
||||
}
|
||||
|
||||
void
|
||||
FGSubsystemGroup::suspend ()
|
||||
{
|
||||
for (int i = 0; i < _members.size(); i++)
|
||||
for (unsigned int i = 0; i < _members.size(); i++)
|
||||
_members[i]->subsystem->suspend();
|
||||
}
|
||||
|
||||
void
|
||||
FGSubsystemGroup::resume ()
|
||||
{
|
||||
for (int i = 0; i < _members.size(); i++)
|
||||
for (unsigned int i = 0; i < _members.size(); i++)
|
||||
_members[i]->subsystem->resume();
|
||||
}
|
||||
|
||||
|
@ -164,7 +164,7 @@ FGSubsystemGroup::get_subsystem (const string &name)
|
|||
void
|
||||
FGSubsystemGroup::remove_subsystem (const string &name)
|
||||
{
|
||||
for (int i = 0; i < _members.size(); i++) {
|
||||
for (unsigned int i = 0; i < _members.size(); i++) {
|
||||
if (name == _members[i]->name) {
|
||||
_members.erase(_members.begin() + i);
|
||||
return;
|
||||
|
@ -181,7 +181,7 @@ FGSubsystemGroup::has_subsystem (const string &name) const
|
|||
FGSubsystemGroup::Member *
|
||||
FGSubsystemGroup::get_member (const string &name, bool create)
|
||||
{
|
||||
for (int i = 0; i < _members.size(); i++) {
|
||||
for (unsigned int i = 0; i < _members.size(); i++) {
|
||||
if (_members[i]->name == name)
|
||||
return _members[i];
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue