Various Irix compiler tweaks.

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

diff --git a/src/Navaids/navlist.hxx b/src/Navaids/navlist.hxx
index 85312ef8e579ac70670f5a34d2e3303f988f41c6..e46521b738a9cba5bf36889838e6080400bf5cc7 100644 (file)
--- a/src/Navaids/navlist.hxx
+++ b/src/Navaids/navlist.hxx
@@ -1,4 +1,4 @@
-// navaids.hxx -- navaids management class
+// navlist.hxx -- navaids management class
 //
 // Written by Curtis Olson, started April 2000.
 //
@@ -21,30 +21,31 @@
 // $Id$
 
 
-#ifndef _FG_NAVAIDS_HXX
-#define _FG_NAVAIDS_HXX
+#ifndef _FG_NAVLIST_HXX
+#define _FG_NAVLIST_HXX
 
 
 #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 FGNavaids {
+class FGNavList {
 
     // convenience types
-    typedef vector < FGNavaid > nav_list_type;
+    typedef vector < FGNav > nav_list_type;
     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;
 
@@ -52,17 +53,19 @@ class FGNavaids {
 
 public:
 
-    FGNavaids();
-    ~FGNavaids();
+    FGNavList();
+    ~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,
-               FGNavaid *n, double *heading, double *dist);
+    bool query( double lon, double lat, double elev, double freq, FGNav *n );
 };
 
 
-#endif // _FG_NAVAIDS_HXX
+extern FGNavList *current_navlist;
+
+
+#endif // _FG_NAVLIST_HXX