Removed a potentially illegal cross-container iterator comparison that made

FlightGear crash on mircosoft visual c++ compilers, as reported by Maik
Justus.

diff --git a/src/Airports/groundnetwork.cxx b/src/Airports/groundnetwork.cxx
index 711efa50b203a8e0e7a97a28cdc7e4c9ab4a9d65..4c02b178a53b1994132726e8c86396eccf1b7313 100644 (file)
--- a/src/Airports/groundnetwork.cxx
+++ b/src/Airports/groundnetwork.cxx
@@ -765,7 +765,7 @@ void FGGroundNetwork::checkSpeedAdjustment(int id, double lat,
     SG_LOG(SG_GENERAL, SG_ALERT, "AI error: Trying to access non-existing aircraft in FGGroundNetwork::checkSpeedAdjustment");
   }
   current = i;
-  closest = current;
+  //closest = current;
   previousInstruction = current->getSpeedAdjustment();
   double mindist = HUGE;
   if (activeTraffic.size()) 
@@ -775,7 +775,7 @@ void FGGroundNetwork::checkSpeedAdjustment(int id, double lat,
                        lat,
                        alt);
       //TrafficVector iterator closest;
-      //closest = current;
+      closest = current;
       for (TrafficVectorIterator i = activeTraffic.begin(); 
           i != activeTraffic.end(); i++)
        {
@@ -804,25 +804,24 @@ void FGGroundNetwork::checkSpeedAdjustment(int id, double lat,
          for (TrafficVectorIterator i = towerController->getActiveTraffic().begin(); 
               i != towerController->getActiveTraffic().end(); i++)
            {
-             if (i != current) {
-               //SGWayPoint curr  (lon,
-               //                lat,
-               //                alt);
-               SGWayPoint other    (i->getLongitude  (),
-                                    i->getLatitude (),
-                                    i->getAltitude  ());
-               other.CourseAndDistance(curr, &course, &dist);
-               bearing = fabs(heading-course);
-               if (bearing > 180)
-                 bearing = 360-bearing;
-               if ((dist < mindist) && (bearing < 60.0))
-                 {
-                   mindist = dist;
-                   closest = i;
-                   minbearing = bearing;
-                   otherReasonToSlowDown = true;
-                 }
-             }
+             //cerr << "Comparing " << current->getId() << " and " << i->getId() << endl;
+             //SGWayPoint curr  (lon,
+             //                  lat,
+             //                  alt);
+             SGWayPoint other    (i->getLongitude  (),
+                                  i->getLatitude (),
+                                  i->getAltitude  ());
+             other.CourseAndDistance(curr, &course, &dist);
+             bearing = fabs(heading-course);
+             if (bearing > 180)
+               bearing = 360-bearing;
+             if ((dist < mindist) && (bearing < 60.0))
+               {
+                 mindist = dist;
+                 closest = i;
+                 minbearing = bearing;
+                 otherReasonToSlowDown = true;
+               }
            }
        }
       // Finally, check UserPosition

diff --git a/src/Airports/trafficcontrol.hxx b/src/Airports/trafficcontrol.hxx
index edf67e574820a97763eb9a6d581be84215180647..18aea60f3890444abf736d4b47a978637ad43487 100644 (file)
--- a/src/Airports/trafficcontrol.hxx
+++ b/src/Airports/trafficcontrol.hxx
@@ -173,7 +173,6 @@ public:
   string getRunway() { return runway; };
   void setCallSign(string clsgn) { callsign = clsgn; };
   string getCallSign() { return callsign; };
-
 };
 
 typedef vector<FGTrafficRecord> TrafficVector;