Tweaks for building with native SGI compilers.

[flightgear.git] / Airports / genapt.cxx

diff --git a/Airports/genapt.cxx b/Airports/genapt.cxx
index 22ad167367c8488c789a00b88581ce8f2fe7f5f0..b8400997466ae7e4a529e7d8bd085aef26980210 100644 (file)
--- a/Airports/genapt.cxx
+++ b/Airports/genapt.cxx
@@ -23,19 +23,20 @@
 // (Log is kept at end of this file)
 
 
-#include <string>        // Standard C++ string library
-#include <vector>
-#include "Include/fg_stl_config.h"
+#include <Include/compiler.h>
 
-#ifdef NEEDNAMESPACESTD
-using namespace std;
-#endif
+#include STL_STRING
+#include <vector>
 
 #ifdef __BORLANDC__
 #  define exception c_exception
 #endif
 #include <math.h>
 
+#ifdef FG_HAVE_NATIVE_SGI_COMPILERS
+#  include <strings.h>
+#endif
+
 #include <Debug/logstream.hxx>
 // #include <Include/fg_types.h>
 #include <Math/fg_geodesy.hxx>
@@ -49,6 +50,9 @@ using namespace std;
 
 #include "genapt.hxx"
 
+FG_USING_STD(string);
+FG_USING_STD(vector);
+
 
 typedef vector < Point3D > container;
 typedef container::iterator iterator;
@@ -235,7 +239,7 @@ fgAptGenerate(const string& path, fgTILE *tile)
        if ( token == "a" ) {
            // airport info record (start of airport)
 
-           if ( apt_id != "" ) {
+           if ( apt_id.length() > 0 ) {
                // we have just finished reading and airport record.
                // process the info
                gen_base(average, perimeter, tile);
@@ -274,7 +278,7 @@ fgAptGenerate(const string& path, fgTILE *tile)
        in >> skipcomment;
     }
 
-    if ( apt_id != "" ) {
+    if ( apt_id.length() > 0 ) {
        // we have just finished reading and airport record.
        // process the info
        size = perimeter.size();
@@ -290,6 +294,12 @@ fgAptGenerate(const string& path, fgTILE *tile)
 
 
 // $Log$
+// Revision 1.14  1999/03/02 01:02:31  curt
+// Tweaks for building with native SGI compilers.
+//
+// Revision 1.13  1999/02/26 22:08:34  curt
+// Added initial support for native SGI compilers.
+//
 // Revision 1.12  1999/02/01 21:08:33  curt
 // Optimizations from Norman Vine.
 //