MSVC warning fixes

[simgear.git] / simgear / metar / MetarStation.cpp

diff --git a/simgear/metar/MetarStation.cpp b/simgear/metar/MetarStation.cpp
index a2122f6df2dd00a38b9c99f6f88dbc0adb4c5469..d0ee73868da4ae623d2f81a12636ebfefb01885b 100644 (file)
--- a/simgear/metar/MetarStation.cpp
+++ b/simgear/metar/MetarStation.cpp
@@ -8,13 +8,9 @@
 #include "MetarStation.h"
 #include <algorithm>
 
-#include <simgear/misc/fgpath.hxx>
-
-#if !defined (SG_HAVE_NATIVE_SGI_COMPILERS)
 SG_USING_STD(ostream);
 SG_USING_STD(cout);
 SG_USING_STD(endl);
-#endif
 
 
 double CMetarStation::decodeDMS( char *b )
@@ -48,7 +44,7 @@ double CMetarStation::decodeDMS( char *b )
                // Direction (E W N S)
                if ( *b == 'W' || *b == 'S' ) r = -r;
        }
-       return r * DEG_TO_RAD;
+       return r * SGD_DEGREES_TO_RADIANS;
 }
 
 // Constructor
@@ -82,14 +78,14 @@ CMetarStation::CMetarStation(
        s = t; t = strchr( s, ';' ); *t = 0; t++;
        double ulongitude = decodeDMS( s );
        s = t; t = strchr( s, ';' ); *t = 0; t++;
-       double altitude = atoi( s ) * FEET_TO_METER;
-       m_altitude = altitude;
+       double altitude = atoi( s ) * SG_FEET_TO_METER;
+       m_altitude = (int)altitude;
        s = t; t = strchr( s, ';' ); *t = 0; t++;
-       double ualtitude = atoi( s ) * FEET_TO_METER;
-       Point3D p( longitude, latitude, altitude+EQUATORIAL_RADIUS_M );
+       double ualtitude = atoi( s ) * SG_FEET_TO_METER;
+       Point3D p( longitude, latitude, altitude+SG_EQUATORIAL_RADIUS_M );
        m_locationPolar = p;
        m_locationCart = sgPolarToCart3d( p );
-       Point3D up( ulongitude, ulatitude, ualtitude+EQUATORIAL_RADIUS_M );
+       Point3D up( ulongitude, ulatitude, ualtitude+SG_EQUATORIAL_RADIUS_M );
        m_upperLocationPolar = up;
        m_upperLocationCart = sgPolarToCart3d( up );
        s = t;
@@ -175,7 +171,7 @@ CMetarStation * CMetarStationDB::find( Point3D locationCart )
 {
     std::map<std::string,CMetarStation*>::iterator itr;
     double bestDist = 99999999;
-    CMetarStation * bestStation;
+    CMetarStation *bestStation = NULL;
     Point3D curLocation = locationCart;
     itr = METAR_Stations.begin(); 
     while(itr != METAR_Stations.end())