Added a property output feature to ControlMap that allows arbitrary binding

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

diff --git a/src/Airports/simple.hxx b/src/Airports/simple.hxx
index e8f513697c07430036f595b38dca6b02d06ddabc..05d11101f1b0b762f88793b6d14b60fa332c3158 100644 (file)
--- a/src/Airports/simple.hxx
+++ b/src/Airports/simple.hxx
@@ -23,8 +23,8 @@
 // $Id$
 
 
-#ifndef _AIRPORTS_HXX
-#define _AIRPORTS_HXX
+#ifndef _SIMPLE_HXX
+#define _SIMPLE_HXX
 
 
 #ifndef __cplusplus                                                          
@@ -32,13 +32,15 @@
 #endif                                   
 
 
-#include <gdbm.h>
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
 
 #include <simgear/compiler.h>
 
-#ifdef FG_HAVE_STD_INCLUDES
+#ifdef SG_HAVE_STD_INCLUDES
 #  include <istream>
-#elif defined( FG_HAVE_NATIVE_SGI_COMPILERS )
+#elif defined( SG_HAVE_NATIVE_SGI_COMPILERS )
 #  include <iostream.h>
 #elif defined( __BORLANDC__ )
 #  include <iostream>
@@ -49,11 +51,20 @@
 #include STL_STRING
 #include <set>
 
-FG_USING_STD(string);
-FG_USING_STD(set);
+#ifndef _MSC_VER
+#   define NDEBUG                      // she don't work without it.
+#endif
+#include <mk4.h>
+#include <mk4str.h>
+#ifndef _MSC_VER
+#  undef NDEBUG
+#endif
 
-#if ! defined( FG_HAVE_NATIVE_SGI_COMPILERS )
-FG_USING_STD(istream);
+SG_USING_STD(string);
+SG_USING_STD(set);
+
+#if ! defined( SG_HAVE_NATIVE_SGI_COMPILERS )
+SG_USING_STD(istream);
 #endif
 
 
@@ -83,7 +94,7 @@ public:
 inline istream&
 operator >> ( istream& in, FGAirport& a )
 {
-    return in >> a.id >> a.longitude >> a.latitude >> a.elevation;
+    return in >> a.id >> a.latitude >> a.longitude >> a.elevation;
 }
 
 
@@ -91,7 +102,8 @@ class FGAirports {
 
 private:
 
-    GDBM_FILE dbf;
+    c4_Storage *storage;
+    c4_View *vAirport;
 
 public:
 
@@ -104,7 +116,7 @@ public:
     // search for the specified id.
     // Returns true if successful, otherwise returns false.
     // On success, airport data is returned thru "airport" pointer.
-    // "airport" is not changed if "id" is not found.
+    // "airport" is not changed if "apt" is not found.
     bool search( const string& id, FGAirport* airport ) const;
     FGAirport search( const string& id ) const;
 };
@@ -112,7 +124,7 @@ public:
 
 class FGAirportsUtil {
 public:
-#ifdef FG_NO_DEFAULT_TEMPLATE_ARGS
+#ifdef SG_NO_DEFAULT_TEMPLATE_ARGS
     typedef set< FGAirport, less< FGAirport > > container;
 #else
     typedef set< FGAirport > container;
@@ -134,8 +146,8 @@ public:
     // load the data
     int load( const string& file );
 
-    // save the data in gdbm format
-    bool dump_gdbm( const string& file );
+    // save the data in metakit format
+    bool dump_mk4( const string& file );
 
     // search for the specified id.
     // Returns true if successful, otherwise returns false.
@@ -146,6 +158,6 @@ public:
 };
 
 
-#endif /* _AIRPORTS_HXX */
+#endif // _SIMPLE_HXX