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 d0e3fd588ef37b6d55aa1b1f2012045baa0e53dc..05d11101f1b0b762f88793b6d14b60fa332c3158 100644 (file)
--- a/src/Airports/simple.hxx
+++ b/src/Airports/simple.hxx
@@ -38,9 +38,9 @@
 
 #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>
@@ -51,16 +51,20 @@
 #include STL_STRING
 #include <set>
 
-#define NDEBUG                 // she don't work without it.
+#ifndef _MSC_VER
+#   define NDEBUG                      // she don't work without it.
+#endif
 #include <mk4.h>
 #include <mk4str.h>
-#undef NDEBUG
+#ifndef _MSC_VER
+#  undef NDEBUG
+#endif
 
-FG_USING_STD(string);
-FG_USING_STD(set);
+SG_USING_STD(string);
+SG_USING_STD(set);
 
-#if ! defined( FG_HAVE_NATIVE_SGI_COMPILERS )
-FG_USING_STD(istream);
+#if ! defined( SG_HAVE_NATIVE_SGI_COMPILERS )
+SG_USING_STD(istream);
 #endif
 
 
@@ -90,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;
 }
 
 
@@ -120,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;