warning fixes

diff --git a/src/Environment/environment_ctrl.cxx b/src/Environment/environment_ctrl.cxx
index 366a794c9ae35255b61f17f9fcd14ed87c20bbc5..008729be6ec0cdd7436ef098813cfdd56354cdf9 100644 (file)
--- a/src/Environment/environment_ctrl.cxx
+++ b/src/Environment/environment_ctrl.cxx
@@ -264,11 +264,11 @@ FGInterpolateEnvironmentCtrl::bucket::lessThan(bucket *a, bucket *b)
 ////////////////////////////////////////////////////////////////////////
 
 FGMetarCtrl::FGMetarCtrl( SGSubsystem * environmentCtrl )
-       : _environmentCtrl(environmentCtrl),
-       station_elevation_ft(0.0),
+       :
        metar_valid(false),
        setup_winds_aloft(true),
        wind_interpolation_required(true),
+       station_elevation_ft(0.0),
        // Interpolation constant definitions.
        EnvironmentUpdatePeriodSec( 0.2 ),
        MaxWindChangeKtsSec( 0.2 ),
@@ -277,7 +277,8 @@ FGMetarCtrl::FGMetarCtrl( SGSubsystem * environmentCtrl )
        MaxCloudAltitudeChangeFtSec( 20.0 ),
        MaxCloudThicknessChangeFtSec( 50.0 ),
        MaxCloudInterpolationHeightFt( 5000.0 ),
-       MaxCloudInterpolationDeltaFt( 4000.0 )
+       MaxCloudInterpolationDeltaFt( 4000.0 ),
+       _environmentCtrl(environmentCtrl)
 {
        windModulator = new FGBasicWindModulator();
 

diff --git a/src/Environment/ridge_lift.cxx b/src/Environment/ridge_lift.cxx
index 4a371a3ae9d79e3688488d2131327cfeb9ee7918..1dd5cb26e57309fca00bbe1edc85a8e4edd4b148 100644 (file)
--- a/src/Environment/ridge_lift.cxx
+++ b/src/Environment/ridge_lift.cxx
@@ -174,7 +174,7 @@ void FGRidgeLift::update(double dt) {
                double ground_wind_from_rad = _surface_wind_from_deg_node->getDoubleValue() * SG_DEGREES_TO_RADIANS + SG_PI;
 
                // compute the remaining probes
-               for (int i = 1; i < sizeof(probe_elev_m)/sizeof(probe_elev_m[0]); i++) {
+               for (unsigned i = 1; i < sizeof(probe_elev_m)/sizeof(probe_elev_m[0]); i++) {
                        SGGeoc probe = myGeocPos.advanceRadM( ground_wind_from_rad, dist_probe_m[i] );
                        // convert to geodetic position for ground level computation
                        SGGeod probeGeod = SGGeod::fromGeoc( probe );
@@ -193,7 +193,7 @@ void FGRidgeLift::update(double dt) {
                slope[2] = (probe_elev_m[2] - probe_elev_m[3]) / dist_probe_m[3];
                slope[3] = (probe_elev_m[4] - probe_elev_m[0]) / -dist_probe_m[4];
        
-               for (int i = 0; i < sizeof(slope)/sizeof(slope[0]); i++)
+               for (unsigned i = 0; i < sizeof(slope)/sizeof(slope[0]); i++)
                        adj_slope[i] = sin(atan(5.0 * pow ( (fabs(slope[i])),1.7) ) ) *sign(slope[i]);
        
                //adjustment