From d838ef5f400dfe064fda22874258458a5b9def87 Mon Sep 17 00:00:00 2001
From: Tim Moore <timoore@redhat.com>
Date: Mon, 24 Aug 2009 17:13:31 +0200
Subject: [PATCH] compilation fixes for gcc -Wall -Werror

Most are cosmetic, but the changes in the FGATCInstruction constructor
fix unitialized members.
---
 src/AIModel/AIFlightPlanCreate.cxx         |  8 ++++----
 src/AIModel/AIFlightPlanCreatePushBack.cxx |  6 +++---
 src/ATC/trafficcontrol.cxx                 | 10 +++++-----
 src/Traffic/TrafficMgr.cxx                 |  3 +--
 4 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/AIModel/AIFlightPlanCreate.cxx b/src/AIModel/AIFlightPlanCreate.cxx
index 560d69db4..64df906f5 100644
--- a/src/AIModel/AIFlightPlanCreate.cxx
+++ b/src/AIModel/AIFlightPlanCreate.cxx
@@ -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);
diff --git a/src/AIModel/AIFlightPlanCreatePushBack.cxx b/src/AIModel/AIFlightPlanCreatePushBack.cxx
index 76458f211..d97e30da2 100644
--- a/src/AIModel/AIFlightPlanCreatePushBack.cxx
+++ b/src/AIModel/AIFlightPlanCreatePushBack.cxx
@@ -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);
diff --git a/src/ATC/trafficcontrol.cxx b/src/ATC/trafficcontrol.cxx
index 3ddfbc4ed..57f718812 100644
--- a/src/ATC/trafficcontrol.cxx
+++ b/src/ATC/trafficcontrol.cxx
@@ -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()
diff --git a/src/Traffic/TrafficMgr.cxx b/src/Traffic/TrafficMgr.cxx
index 5abcc755c..050f0846d 100644
--- a/src/Traffic/TrafficMgr.cxx
+++ b/src/Traffic/TrafficMgr.cxx
@@ -128,8 +128,7 @@ void FGTrafficManager::init()
       }
       ulCloseDir(d);
     }
-    time_t now = time(NULL) + fgGetLong("/sim/time/warp");
-
+    
     currAircraft = scheduledAircraft.begin();
     currAircraftClosest = scheduledAircraft.begin();
 }