MSVC++ changes contributed by Geoff McLane.

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

diff --git a/src/Airports/runways.hxx b/src/Airports/runways.hxx
index 4b6e5e3d131ffda22a196fb72e1cd993ccfb8dbd..5512097d8d44e3c41e709d6db9ee437f79249c21 100644 (file)
--- a/src/Airports/runways.hxx
+++ b/src/Airports/runways.hxx
@@ -38,7 +38,7 @@
 
 #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,16 +49,22 @@
 #include STL_STRING
 #include <vector>
 
+#ifndef _MSC_VER
 #define NDEBUG                 // she don't work without it.
+#endif // !_MSC_VER
+
 #include <mk4.h>
 #include <mk4str.h>
+
+#ifndef _MSC_VER
 #undef NDEBUG
+#endif // !_MSC_VER
 
-FG_USING_STD(string);
-FG_USING_STD(vector);
+SG_USING_STD(string);
+SG_USING_STD(vector);
 
-#if ! defined( FG_HAVE_NATIVE_SGI_COMPILERS )
-FG_USING_STD(istream);
+#if ! defined( SG_HAVE_NATIVE_SGI_COMPILERS )
+SG_USING_STD(istream);
 #endif
 
 
@@ -113,12 +119,13 @@ public:
     // Destructor
     ~FGRunways();
 
-    // search for the specified id.
+    // search for the specified apt id.
     // Returns true if successful, otherwise returns false.
     // On success, runway data is returned thru "runway" pointer.
     // "runway" is not changed if "apt" is not found.
-    bool search( const string& id, FGRunway* runway );
-    FGRunway search( const string& id );
+    bool search( const string& aptid, FGRunway* runway );
+    bool search( const string& aptid, const string& rwyno, FGRunway* runway );
+    FGRunway search( const string& aptid );
     bool next( FGRunway* runway );
     FGRunway next();
 };