Fix line endings

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

diff --git a/src/Navaids/navdb.cxx b/src/Navaids/navdb.cxx
index 7be1809a34df7bf04092d34f6fa75afc2fc4a8fe..2e8d12c0f03b118371dcbacce2c08da1caab7344 100644 (file)
--- a/src/Navaids/navdb.cxx
+++ b/src/Navaids/navdb.cxx
@@ -20,6 +20,9 @@
 //
 // $Id$
 
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
 
 #include <simgear/compiler.h>
 
@@ -146,7 +149,7 @@ bool fgNavDBInit( FGAirportList *airports,
     path.append( "Navaids/carrier_nav.dat" );
     
     file = path.str();
-    SG_LOG( SG_GENERAL, SG_ALERT, "opening file: " << path.str() );
+    SG_LOG( SG_GENERAL, SG_INFO, "opening file: " << path.str() );
     
     sg_gzifstream incarrier( path.str() );
     
@@ -187,9 +190,8 @@ bool fgNavDBInit( FGAirportList *airports,
     path = globals->get_fg_root();
     path.append( "Navaids/TACAN_freq.dat" );
     
-    file = path.str();
-    cout << file << endl;
-    //
+    SG_LOG( SG_GENERAL, SG_INFO, "opening file: " << path.str() );
+        
     sg_gzifstream inchannel( path.str() );
     
     if ( !inchannel.is_open() ) {
@@ -197,8 +199,7 @@ bool fgNavDBInit( FGAirportList *airports,
         exit(-1);
     }
     
-    // skip first two lines
-    inchannel >> skipeol;
+    // skip first line
     inchannel >> skipeol;
     
 #ifdef __MWERKS__
@@ -292,10 +293,10 @@ void fgNavDBAlignLOCwithRunway( FGRunwayList *runways, FGNavList *loclist,
                                 double threshold ) {
     nav_map_type navmap = loclist->get_navaids();
 
-    nav_map_iterator freq = navmap.begin();
+    nav_map_const_iterator freq = navmap.begin();
     while ( freq != navmap.end() ) {
         nav_list_type locs = freq->second;
-        nav_list_iterator loc = locs.begin();
+        nav_list_const_iterator loc = locs.begin();
         while ( loc != locs.end() ) {
             string name = (*loc)->get_name();
             string::size_type pos1 = name.find(" ");