Attached patches remove BORLANDC, and hence SG_MATH_EXCEPTION_CLASH and SG_INCOM

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

diff --git a/src/Navaids/fix.hxx b/src/Navaids/fix.hxx
index a5f8f891db79fbe8b7bb1a3705b2b58930ba7b6f..666966a82e1c49b362dd8b5a05dfc8173d813e78 100644 (file)
--- a/src/Navaids/fix.hxx
+++ b/src/Navaids/fix.hxx
@@ -32,18 +32,9 @@
 #include <simgear/compiler.h>
 #include <simgear/misc/sgstream.hxx>
 
-#ifdef SG_HAVE_STD_INCLUDES
 #  include <istream>
-#elif defined( __BORLANDC__ ) || (__APPLE__)
-#  include <iostream>
-#else
-#  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 +42,7 @@ SG_USING_STD(string);
 
 class FGFix {
 
-    string ident;
+    std::string ident;
     double lon, lat;
 
 public:
@@ -59,11 +50,11 @@ public:
     inline FGFix(void);
     inline ~FGFix(void) {}
 
-    inline const 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 +67,8 @@ FGFix::FGFix()
 }
 
 
-inline istream&
-operator >> ( istream& in, FGFix& f )
+inline std::istream&
+operator >> ( std::istream& in, FGFix& f )
 {
     in >> f.lat;