Converted to new logstream debugging facility. This allows release

[flightgear.git] / Airports / genapt.cxx

diff --git a/Airports/genapt.cxx b/Airports/genapt.cxx
index 4b078d8a3dd13b4081cb72ba5e3edf78efc5dea0..b65c5fa7ab94ce0ad7fc7778d0b888f08f545200 100644 (file)
--- a/Airports/genapt.cxx
+++ b/Airports/genapt.cxx
@@ -31,7 +31,7 @@
 using namespace std;
 #endif
 
-#include <Debug/fg_debug.h>
+#include <Debug/logstream.hxx>
 // #include <Include/fg_types.h>
 #include <Math/fg_geodesy.hxx>
 #include <Math/mat3.h>
@@ -97,9 +97,9 @@ gen_base( const Point3D& average, const container& perimeter, fgTILE *t)
 
     // find airport base material in the properties list
     if ( ! material_mgr.find( APT_BASE_MATERIAL, fragment.material_ptr )) {
-       fgPrintf( FG_TERRAIN, FG_ALERT, 
-                 "Ack! unknown material name = %s in fgAptGenerat()\n",
-                 APT_BASE_MATERIAL );
+       FG_LOG( FG_TERRAIN, FG_ALERT, 
+               "Ack! unknown material name = " << APT_BASE_MATERIAL 
+               << " in fgAptGenerat()" );
     }
 
     printf(" tile center = %.2f %.2f %.2f\n", 
@@ -219,10 +219,10 @@ fgAptGenerate(const string& path, fgTILE *tile)
     apt_id = "";
 
     // read in each line of the file
-    in.eat_comments();
+    in >> skipcomment;
     while ( ! in.eof() )
     {
-       in.stream() >> token;
+       in >> token;
 
        if ( token == "a" ) {
            // airport info record (start of airport)
@@ -234,7 +234,7 @@ fgAptGenerate(const string& path, fgTILE *tile)
            }
 
            cout << "Reading airport record\n";
-           in.stream() >> apt_id;
+           in >> apt_id;
            apt_name = "";
            i = 1;
            avex = avey = avez = 0.0;
@@ -250,7 +250,7 @@ fgAptGenerate(const string& path, fgTILE *tile)
            // out of the base terrain.  The points are given in
            // counter clockwise order and are specified in lon/lat
            // degrees.
-           in.stream() >> p;
+           in >> p;
            avex += tile->nodes[i][0];
            avey += tile->nodes[i][1];
            avez += tile->nodes[i][2];
@@ -262,8 +262,7 @@ fgAptGenerate(const string& path, fgTILE *tile)
            while ( in.get(c) && c != '\n' );
        }
 
-       // airports.insert(a);
-       in.eat_comments();
+       in >> skipcomment;
     }
 
     if ( apt_id != "" ) {
@@ -282,6 +281,14 @@ fgAptGenerate(const string& path, fgTILE *tile)
 
 
 // $Log$
+// Revision 1.9  1998/11/06 21:17:32  curt
+// Converted to new logstream debugging facility.  This allows release
+// builds with no messages at all (and no performance impact) by using
+// the -DFG_NDEBUG flag.
+//
+// Revision 1.8  1998/11/06 14:46:59  curt
+// Changes to track Bernie's updates to fgstream.
+//
 // Revision 1.7  1998/10/20 18:26:06  curt
 // Updates to point3d.hxx
 //