From: mfranz Date: Thu, 11 Oct 2007 09:19:49 +0000 (+0000) Subject: Make sure the __MWERKS__ test can't go unnoticed. It's really time to X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=b66ea980ad35c7a9a1c7761c66662cc506a0a1c4;p=flightgear.git Make sure the __MWERKS__ test can't go unnoticed. It's really time to remove all those 41 hacks if possible. Metrowerks is under category "Defunct software companies" in Wikipedia, its compiler was known to work on PowerPC (which we don't support, anway, right?) and on some Unices. The hacks are in CVS since the first commit 2002/9/10 (old repository!) and probably were in the code long before that. Any platform where such a broken compiler is still used, will hardly be suitable to run fgfs at all. --- diff --git a/src/Navaids/navdb.cxx b/src/Navaids/navdb.cxx index 808ff80b4..e6e6b8980 100644 --- a/src/Navaids/navdb.cxx +++ b/src/Navaids/navdb.cxx @@ -74,16 +74,19 @@ bool fgNavDBInit( FGAirportList *airports, in >> skipeol; -//#ifdef __MWERKS_ -// -// FIXME -- Please complain to the FlightGear mailing list, if you still need this hack. -// -// char c = 0; -// while ( in.get(c) && c != '\0' ) { -// in.putback(c); -//#else +#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 +#endif FGNavRecord *r = new FGNavRecord; in >> (*r);