Suppress warnings

[flightgear.git] / src / ATCDCL / ATC.hxx

diff --git a/src/ATCDCL/ATC.hxx b/src/ATCDCL/ATC.hxx
index 1f73b5bef20b88860098aaa12b160a99489bbd79..0a6d55a8b3e7e9c189954433a0812252fcab5d6e 100644 (file)
--- a/src/ATCDCL/ATC.hxx
+++ b/src/ATCDCL/ATC.hxx
@@ -35,9 +35,9 @@
 
 #include "ATCVoice.hxx"
 
-SG_USING_STD(ostream);
-SG_USING_STD(string);
-SG_USING_STD(ios);
+using std::ostream;
+using std::string;
+using std::ios;
 
 enum plane_type {
        UNKNOWN,
@@ -91,9 +91,9 @@ struct ATCData {
 // perhaps we could use an FGRunway instead of this.
 // That wouldn't cache the orthopos though.
 struct RunwayDetails {
-       Point3D threshold_pos;
-       Point3D end1ortho;      // ortho projection end1 (the threshold ATM)
-       Point3D end2ortho;      // ortho projection end2 (the take off end in the current hardwired scheme)
+       SGGeod threshold_pos;
+       SGVec3d end1ortho;      // ortho projection end1 (the threshold ATM)
+       SGVec3d end2ortho;      // ortho projection end2 (the take off end in the current hardwired scheme)
        double hdg;             // true runway heading
        double length;  // In *METERS*
        double width;   // ditto
@@ -297,8 +297,7 @@ operator >> ( std::istream& fin, ATCData& a )
        // cout << a.ident << endl;
        
        // generate cartesian coordinates
-       Point3D geod( a.lon * SGD_DEGREES_TO_RADIANS, a.lat * SGD_DEGREES_TO_RADIANS, a.elev );
-       Point3D cart = sgGeodToCart( geod );
+        SGVec3d cart = SGVec3d::fromGeod(SGGeod::fromDegM(a.lon, a.lat, a.elev));
        a.x = cart.x();
        a.y = cart.y();
        a.z = cart.z();