James Turner:

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

diff --git a/src/Navaids/navdb.cxx b/src/Navaids/navdb.cxx
index f7a2761f3dc67ee64db562624c91c7990db9d086..089639f042500403c325292984aa0e6a3fd8c61a 100644 (file)
--- a/src/Navaids/navdb.cxx
+++ b/src/Navaids/navdb.cxx
@@ -26,9 +26,10 @@
 
 #include <simgear/compiler.h>
 
-#include STL_STRING
+#include <string>
 
 #include <simgear/debug/logstream.hxx>
+#include <simgear/math/sg_geodesy.hxx>
 
 #include <Airports/runways.hxx>
 #include <Airports/simple.hxx>
@@ -37,7 +38,7 @@
 #include "navrecord.hxx"
 #include "navdb.hxx"
 
-SG_USING_STD( string );
+using std::string;
 
 
 // load and initialize the navigational databases
@@ -73,21 +74,7 @@ bool fgNavDBInit( FGAirportList *airports,
     in >> skipeol;
     in >> skipeol;
 
-
-#ifdef __MWERKS__
-
- FIXME -- Please report to the FlightGear mailing list, if you still use a
-          compiler identifying itself as __MWERKS__ that needs this hack.
-          There are 41 instances of it in the SimGear & FilghtGear code,
-          and they are scheduled for removal.
-
-    char c = 0;
-    while ( in.get(c) && c != '\0' ) {
-        in.putback(c);
-#else
     while ( ! in.eof() ) {
-#endif
-
         FGNavRecord *r = new FGNavRecord;
         in >> (*r);
         if ( r->get_type() > 95 ) {
@@ -169,14 +156,7 @@ bool fgNavDBInit( FGAirportList *airports,
     //incarrier >> skipeol;
     //incarrier >> skipeol;
     
-#ifdef __MWERKS__
-    char c = 0;
-    while ( incarrier.get(c) && c != '\0'  ) {
-        incarrier.putback(c);
-#else
     while ( ! incarrier.eof() ) {
-#endif
-        
         FGNavRecord *r = new FGNavRecord;
         incarrier >> (*r);
         carrierlist->add ( r );
@@ -208,15 +188,7 @@ bool fgNavDBInit( FGAirportList *airports,
     
     // skip first line
     inchannel >> skipeol;
-    
-#ifdef __MWERKS__
-    char c = 0;
-    while ( inchannel.get(c) && c != '\0'  ) {
-        in.putback(c);
-#else
     while ( ! inchannel.eof() ) {
-#endif
-
         FGTACANRecord *r = new FGTACANRecord;
         inchannel >> (*r);
         channellist->add ( r );