X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FNavaids%2Fawynet.cxx;h=b2865b4e1066389fd977f6051002e8fbfa8ab5a5;hb=76958a038251a697ad798bce630e7d793797cf78;hp=0bc2b7e2f32137e1e001744c5464981d0d10cd44;hpb=96872a73cbea38e0cb9c5ebe2d6a16554de85505;p=flightgear.git diff --git a/src/Navaids/awynet.cxx b/src/Navaids/awynet.cxx index 0bc2b7e2f..b2865b4e1 100755 --- a/src/Navaids/awynet.cxx +++ b/src/Navaids/awynet.cxx @@ -25,6 +25,7 @@ #include #include +#include #include @@ -34,7 +35,10 @@ #include "awynet.hxx" -SG_USING_STD(sort); +using std::sort; + +using std::cerr; +using std::endl; /************************************************************************** * FGNode @@ -210,14 +214,7 @@ void FGAirwayNetwork::load(SGPath path) in >> skipeol; // read in each remaining line of the file - -#ifdef __MWERKS__ - char c = 0; - while ( in.get(c) && c != '\0' ) { - in.putback(c); -#else while ( ! in.eof() ) { -#endif string token; in >> token; @@ -227,6 +224,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 << " "