Fix some gcc warnings
This commit is contained in:
parent
b0566a3ed0
commit
eab9a65ebc
4 changed files with 5 additions and 8 deletions
|
@ -897,7 +897,8 @@ void FGNavRadio::updateAudio()
|
||||||
}
|
}
|
||||||
|
|
||||||
last_time = now;
|
last_time = now;
|
||||||
play_count = ++play_count % NUM_IDENT_SLOTS;
|
play_count++;
|
||||||
|
play_count %= NUM_IDENT_SLOTS;
|
||||||
|
|
||||||
// Previous ident is out of time; if still playing, cut it off:
|
// Previous ident is out of time; if still playing, cut it off:
|
||||||
_sgr->stop( nav_fx_name );
|
_sgr->stop( nav_fx_name );
|
||||||
|
|
|
@ -71,10 +71,10 @@ bool free_hostname = false;
|
||||||
void fgExitCleanup();
|
void fgExitCleanup();
|
||||||
|
|
||||||
static bool fpeAbort = false;
|
static bool fpeAbort = false;
|
||||||
static void handleFPE(int);
|
|
||||||
static void initFPE();
|
static void initFPE();
|
||||||
|
|
||||||
#if defined(HAVE_FEENABLEEXCEPT)
|
#if defined(HAVE_FEENABLEEXCEPT)
|
||||||
|
static void handleFPE(int);
|
||||||
static void
|
static void
|
||||||
initFPE ()
|
initFPE ()
|
||||||
{
|
{
|
||||||
|
@ -115,10 +115,6 @@ handleFPE (int num)
|
||||||
SG_LOG(SG_GENERAL, SG_ALERT, "Floating point interrupt (SIGFPE)");
|
SG_LOG(SG_GENERAL, SG_ALERT, "Floating point interrupt (SIGFPE)");
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
static void handleFPE(int)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
static void initFPE()
|
static void initFPE()
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
|
@ -317,7 +317,7 @@ void FGAirwayNetwork::load(const SGPath& path)
|
||||||
int FGAirwayNetwork::findNearestNode(const SGGeod& aPos)
|
int FGAirwayNetwork::findNearestNode(const SGGeod& aPos)
|
||||||
{
|
{
|
||||||
double minDist = HUGE_VAL;
|
double minDist = HUGE_VAL;
|
||||||
int index;
|
int index = -1;
|
||||||
SGVec3d cart = SGVec3d::fromGeod(aPos);
|
SGVec3d cart = SGVec3d::fromGeod(aPos);
|
||||||
|
|
||||||
//cerr << "Lat " << lat << " lon " << lon << endl;
|
//cerr << "Lat " << lat << " lon " << lon << endl;
|
||||||
|
|
|
@ -221,7 +221,7 @@ bool FGAISchedule::update(time_t now, const SGVec3d& userCart)
|
||||||
// Check if this aircraft has been released.
|
// Check if this aircraft has been released.
|
||||||
FGTrafficManager *tmgr = (FGTrafficManager *) globals->get_subsystem("Traffic Manager");
|
FGTrafficManager *tmgr = (FGTrafficManager *) globals->get_subsystem("Traffic Manager");
|
||||||
if (tmgr->isReleased(AIManagerRef)) {
|
if (tmgr->isReleased(AIManagerRef)) {
|
||||||
AIManagerRef = NULL;
|
AIManagerRef = 0;
|
||||||
} else {
|
} else {
|
||||||
return true; // in visual range, let the AIManager handle it
|
return true; // in visual range, let the AIManager handle it
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue