return attribute mask as unsigned

[flightgear.git] / src / Navaids / awynet.cxx

diff --git a/src/Navaids/awynet.cxx b/src/Navaids/awynet.cxx
index 564b4bfb78bc1feb8a280dc49c12e922bc48bfda..09a96a883a39f1b7043584a97cedb219ac771830 100755 (executable)
--- a/src/Navaids/awynet.cxx
+++ b/src/Navaids/awynet.cxx
@@ -25,6 +25,7 @@
 
 #include <math.h>
 #include <algorithm>
+#include <iostream>
 
 #include <simgear/compiler.h>
 
@@ -36,6 +37,9 @@
 
 SG_USING_STD(sort);
 
+using std::cerr;
+using std::endl;
+
 /**************************************************************************
  * FGNode
  *************************************************************************/
@@ -141,6 +145,12 @@ FGAirwayNetwork::FGAirwayNetwork()
   maxDistance = 0;
 }
 
+FGAirwayNetwork::~FGAirwayNetwork()
+{
+    for (unsigned int it = 0; it < nodes.size(); it++) {
+       delete nodes[ it];
+    }
+}
 void FGAirwayNetwork::addAirway(const FGAirway &seg)
 {
   segments.push_back(seg);
@@ -221,6 +231,7 @@ void FGAirwayNetwork::load(SGPath path)
       // Read each line from the database
       identStart = token;
       in >> latStart >> lonStart >> identEnd >> latEnd >> lonEnd >> type >> base >> top >> name;
+      in >> skipeol;
       /*out << identStart << " "
        << latStart   << " "
        << lonStart   << " "
@@ -262,7 +273,8 @@ void FGAirwayNetwork::load(SGPath path)
       char buffer[32];
       string startNode, endNode;
       // Start
-      snprintf(buffer, 32, "%s%d%d", identStart.c_str(), (int) latStart, (int) lonStart);
+      buffer[sizeof(buffer)-1] = 0;
+      snprintf(buffer, sizeof(buffer)-1, "%s%d%d", identStart.c_str(), (int) latStart, (int) lonStart);
       startNode = buffer;
 
       node_map_iterator itr = nodesMap.find(string(buffer));