// $Id$
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#include <simgear/debug/logstream.hxx>
-#include <simgear/misc/fgstream.hxx>
+#include <simgear/misc/sgstream.hxx>
#include <simgear/math/sg_geodesy.hxx>
#include "fixlist.hxx"
// load the navaids and build the map
-bool FGFixList::init( FGPath path ) {
+bool FGFixList::init( SGPath path ) {
FGFix fix;
fixlist.erase( fixlist.begin(), fixlist.end() );
- fg_gzifstream in( path.str() );
+ sg_gzifstream in( path.str() );
if ( !in.is_open() ) {
- FG_LOG( FG_GENERAL, FG_ALERT, "Cannot open file: " << path.str() );
+ SG_LOG( SG_GENERAL, SG_ALERT, "Cannot open file: " << path.str() );
exit(-1);
}
#ifdef __MWERKS__
char c = 0;
- while ( in.get(c) && c != '\0' && fix.get_ident() != "[End]" ) {
+ while ( in.get(c) && c != '\0' && fix.get_ident() != (string)"[End]" ) {
in.putback(c);
in >> fix;
- if ( fix.get_ident() != "[End]" ) {
+ if ( fix.get_ident() != (string)"[End]" ) {
fixlist[fix.get_ident()] = fix;
}
in >> skipcomment;
#else
- while ( ! in.eof() && fix.get_ident() != "[End]" ) {
+ while ( ! in.eof() && fix.get_ident() != (string)"[End]" ) {
in >> fix;
/* cout << "id = " << n.get_ident() << endl;
cout << " type = " << n.get_type() << endl;
cout << " elev = " << n.get_elev() << endl;
cout << " freq = " << n.get_freq() << endl;
cout << " range = " << n.get_range() << endl; */
- if ( fix.get_ident() != "[End]" ) {
+ if ( fix.get_ident() != (string)"[End]" ) {
fixlist[fix.get_ident()] = fix;
}
in >> skipcomment;