return attribute mask as unsigned

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

diff --git a/src/Navaids/fix.hxx b/src/Navaids/fix.hxx
index e50bc2761fecfeafa826bc6d5d5a61168085f12c..2335be1fb3c0257f663706554d8f8b65ca511df0 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$
 
@@ -40,10 +40,7 @@
 #  include <istream.h>
 #endif
 
-SG_USING_STD(istream);
-
 #include STL_STRING
-SG_USING_STD(string);
 
 // SG_USING_STD(cout);
 // SG_USING_STD(endl);
@@ -51,7 +48,7 @@ SG_USING_STD(string);
 
 class FGFix {
 
-    string ident;
+    std::string ident;
     double lon, lat;
 
 public:
@@ -59,11 +56,11 @@ public:
     inline FGFix(void);
     inline ~FGFix(void) {}
 
-    inline string get_ident() const { return ident; }
+    inline const std::string& get_ident() const { return ident; }
     inline double get_lon() const { return lon; }
     inline double get_lat() const { return lat; }
 
-    friend istream& operator>> ( istream&, FGFix& );
+    friend std::istream& operator>> ( std::istream&, FGFix& );
 };
 
 
@@ -76,8 +73,8 @@ FGFix::FGFix()
 }
 
 
-inline istream&
-operator >> ( istream& in, FGFix& f )
+inline std::istream&
+operator >> ( std::istream& in, FGFix& f )
 {
     in >> f.lat;