Added static port system and a new altimeter model connected to it.

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

diff --git a/src/Navaids/fix.hxx b/src/Navaids/fix.hxx
index 3f2e50083d8259c93ca75750bcc4e5abc886c0be..bf2bd802a98998fb8e1e47e3822e27d3081cf037 100644 (file)
--- a/src/Navaids/fix.hxx
+++ b/src/Navaids/fix.hxx
@@ -25,14 +25,18 @@
 #define _FG_FIX_HXX
 
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #include <simgear/compiler.h>
-#include <simgear/misc/fgstream.hxx>
+#include <simgear/misc/sgstream.hxx>
 
 #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>
@@ -53,7 +57,7 @@ class FGFix {
 
 public:
 
-    inline FGFix(void) {}
+    inline FGFix(void);
     inline ~FGFix(void) {}
 
     inline string get_ident() const { return ident; }
@@ -64,15 +68,28 @@ public:
 };
 
 
+inline
+FGFix::FGFix()
+  : ident(""),
+    lon(0.0),
+    lat(0.0)
+{
+}
+
+
 inline istream&
 operator >> ( istream& in, FGFix& f )
 {
-    in >> f.ident >> f.lat >> f.lon;
+    in >> f.ident;
+
+    if ( f.ident[0] == '[' )
+        return in >> skipeol;
+
+    in >> f.lat >> f.lon;
 
     // cout << "id = " << f.ident << endl;
 
-    // return in >> skipeol;
-    return in;
+    return in >> skipeol;
 }