This should apply, and everything should build cleanly, in isolation from the

[flightgear.git] / src / Airports / simple.cxx

diff --git a/src/Airports/simple.cxx b/src/Airports/simple.cxx
index e92b08fbd1c9e264392fc24c09db8e105429ca5b..5c9330bd59142762e635a6daaff86973a5201d50 100644 (file)
--- a/src/Airports/simple.cxx
+++ b/src/Airports/simple.cxx
@@ -47,7 +47,7 @@
 #include <Main/fg_props.hxx>
 #include <Airports/runways.hxx>
 
-#include STL_STRING
+#include <string>
 
 #include "simple.hxx"
 #include "xmlloader.hxx"
@@ -197,14 +197,14 @@ FGAirport* FGAirportList::search(double lon_deg, double lat_deg)
 // search for the airport nearest the specified position and
 // passing the filter
 FGAirport* FGAirportList::search(double lon_deg, double lat_deg,
-        FGAirportSearchFilter& search)
+        FGAirportSearchFilter& filter)
 {
     double min_dist = 360.0;
     airport_list_iterator it = airports_array.begin();
     airport_list_iterator end = airports_array.end();
     airport_list_iterator closest = end;
     for (; it != end; ++it) {
-        if (!search.acceptable(*it))
+        if (!filter.pass(*it))
             continue;
 
         // crude manhatten distance based on lat/lon difference