Changes to keep the various autopilot properties from stepping on each

[flightgear.git] / src / Navaids / navlist.hxx

diff --git a/src/Navaids/navlist.hxx b/src/Navaids/navlist.hxx
index 341bab049a1037616449d920700085603ff008ff..e46521b738a9cba5bf36889838e6080400bf5cc7 100644 (file)
--- a/src/Navaids/navlist.hxx
+++ b/src/Navaids/navlist.hxx
@@ -26,15 +26,15 @@
 
 
 #include <simgear/compiler.h>
-#include <simgear/misc/fgpath.hxx>
+#include <simgear/misc/sg_path.hxx>
 
 #include <map>
 #include <vector>
 
 #include "nav.hxx"
 
-FG_USING_STD(map);
-FG_USING_STD(vector);
+SG_USING_STD(map);
+SG_USING_STD(vector);
 
 
 class FGNavList {
@@ -44,7 +44,8 @@ class FGNavList {
     typedef nav_list_type::iterator nav_list_iterator;
     typedef nav_list_type::const_iterator nav_list_const_iterator;
 
-    typedef map < int, nav_list_type, less<int> > nav_map_type;
+    // typedef map < int, nav_list_type, less<int> > nav_map_type;
+    typedef map < int, nav_list_type > nav_map_type;
     typedef nav_map_type::iterator nav_map_iterator;
     typedef nav_map_type::const_iterator nav_map_const_iterator;
 
@@ -56,12 +57,11 @@ public:
     ~FGNavList();
 
     // load the navaids and build the map
-    bool init( FGPath path );
+    bool init( SGPath path );
 
     // query the database for the specified frequency, lon and lat are
     // in degrees, elev is in meters
-    bool query( double lon, double lat, double elev, double freq,
-               FGNav *n, double *heading, double *dist);
+    bool query( double lon, double lat, double elev, double freq, FGNav *n );
 };