make attribute strings lowercase with hyphen instead of underscore;

[flightgear.git] / src / Navaids / fix.hxx

diff --git a/src/Navaids/fix.hxx b/src/Navaids/fix.hxx
index 9fd6115c949c526239750b6fe5de8eaa81a648bb..a5f8f891db79fbe8b7bb1a3705b2b58930ba7b6f 100644 (file)
--- a/src/Navaids/fix.hxx
+++ b/src/Navaids/fix.hxx
@@ -2,7 +2,7 @@
 //
 // Written by Curtis Olson, started April 2000.
 //
-// Copyright (C) 2000  Curtis L. Olson - curt@flightgear.org
+// Copyright (C) 2000  Curtis L. Olson - http://www.flightgear.org/~curt
 //
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License as
@@ -16,7 +16,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 // $Id$
 
@@ -34,21 +34,20 @@
 
 #ifdef SG_HAVE_STD_INCLUDES
 #  include <istream>
-#elif defined( SG_HAVE_NATIVE_SGI_COMPILERS )
-#  include <iostream.h>
-#elif defined( __BORLANDC__ )
+#elif defined( __BORLANDC__ ) || (__APPLE__)
 #  include <iostream>
 #else
 #  include <istream.h>
 #endif
 
-#if ! defined( SG_HAVE_NATIVE_SGI_COMPILERS )
 SG_USING_STD(istream);
-#endif
 
 #include STL_STRING
 SG_USING_STD(string);
 
+// SG_USING_STD(cout);
+// SG_USING_STD(endl);
+
 
 class FGFix {
 
@@ -60,7 +59,7 @@ public:
     inline FGFix(void);
     inline ~FGFix(void) {}
 
-    inline string get_ident() const { return ident; }
+    inline const string& get_ident() const { return ident; }
     inline double get_lon() const { return lon; }
     inline double get_lat() const { return lat; }
 
@@ -80,12 +79,12 @@ FGFix::FGFix()
 inline istream&
 operator >> ( istream& in, FGFix& f )
 {
-    in >> f.ident;
+    in >> f.lat;
 
-    if ( f.ident[0] == '[' )
+    if ( f.lat > 95.0 ) {
         return in >> skipeol;
-
-    in >> f.lat >> f.lon;
+    }
+    in >> f.lon >> f.ident;
 
     // cout << "id = " << f.ident << endl;