fly/flightgear
1
0
Fork 0
Code Activity

compilation fixes for gcc -Wall -Werror

Browse source 
Most are cosmetic, but the changes in the FGATCInstruction constructor
fix unitialized members.
This commit is contained in:
Tim Moore 2009-08-24 17:13:31 +02:00
parent b1a3d8ba16
commit d838ef5f40
4 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/AIModel/AIFlightPlanCreate.cxx
View file

@ -529,10 +529,10 @@ void FGAIFlightPlan::createParking(FGAIAircraft *ac, FGAirport *apt, double radi
{
waypoint* wpt;
double aptElev = apt->getElevation();
double lat, lat2;
double lon, lon2;
double az2;
double heading;
double lat = 0.0, lat2 = 0.0;
double lon = 0.0, lon2 = 0.0;
double az2 = 0.0;
double heading = 0.0;
double vTaxi = ac->getPerformance()->vTaxi();
double vTaxiReduced = vTaxi * (2.0/3.0);

6
src/AIModel/AIFlightPlanCreatePushBack.cxx
View file

@ -246,9 +246,9 @@ void FGAIFlightPlan::createPushBackFallBack(FGAIAircraft *ac, bool firstFlight,
double heading;
double lat;
double lon;
double lat2;
double lon2;
double az2;
double lat2 = 0.0;
double lon2 = 0.0;
double az2 = 0.0;
double vTaxi = ac->getPerformance()->vTaxi();
double vTaxiBackward = vTaxi * (-2.0/3.0);

10
src/ATC/trafficcontrol.cxx
View file

@ -248,7 +248,7 @@ bool FGTrafficRecord::isOpposing (FGGroundNetwork *net, FGTrafficRecord &other,
for (intVecIterator i = intentions.begin(); i != intentions.end(); i++)
{
if (opp = net->findSegment(other.currentPos)->opposite())
if ((opp = net->findSegment(other.currentPos)->opposite()))
{
if ((*i) > 0)
if (opp->getIndex() == net->findSegment(*i)->getIndex())
@ -267,7 +267,7 @@ bool FGTrafficRecord::isOpposing (FGGroundNetwork *net, FGTrafficRecord &other,
{
// cerr << "Current segment 1 " << (*i) << endl;
if ((*i) > 0) {
if (opp = net->findSegment(*i)->opposite())
if ((opp = net->findSegment(*i)->opposite()))
{
if (opp->getIndex() ==
net->findSegment(*j)->getIndex())
@ -318,9 +318,9 @@ FGATCInstruction::FGATCInstruction()
changeAltitude = false;
resolveCircularWait = false;
double speed = 0;
double heading = 0;
double alt = 0;
speed = 0;
heading = 0;
alt = 0;
}
bool FGATCInstruction::hasInstruction()

3
src/Traffic/TrafficMgr.cxx
View file

@ -128,8 +128,7 @@ void FGTrafficManager::init()
}
ulCloseDir(d);
}
time_t now = time(NULL) + fgGetLong("/sim/time/warp");
currAircraft = scheduledAircraft.begin();
currAircraftClosest = scheduledAircraft.begin();
}