Fix some warnings identified by Clang

_ unused private members. Removed in most cases, commented
out in a couple of cases where it feels as if the code might be used in the future.

diff --git a/src/AIModel/AICarrier.hxx b/src/AIModel/AICarrier.hxx
index a34279b8f22bf5800c1b242970de4121a05576ba..970cd7cea293c88245e34641d45bd6e5b137afb9 100644 (file)
--- a/src/AIModel/AICarrier.hxx
+++ b/src/AIModel/AICarrier.hxx
@@ -104,14 +104,11 @@ private:
     double dist;            // the distance of the eyepoint from the flols
     double angle;
     int source;             // the flols light which is visible at the moment
-    bool wave_off_lights;
     bool in_to_wind;
 
     // these are for maneuvering the carrier
     SGGeod mOpBoxPos;
 
-    double wind_speed_from_north_kts ;
-    double wind_speed_from_east_kts  ;
     double wind_speed_kts;  //true wind speed
     double wind_from_deg;   //true wind direction
     double rel_wind;

diff --git a/src/AIModel/submodel.hxx b/src/AIModel/submodel.hxx
index d4a0d8dedeb60ce49d1c42698ff8bb0a58ea5784..5d01d3d761b534d88d94b3ae71fe982129f67fe3 100644 (file)
--- a/src/AIModel/submodel.hxx
+++ b/src/AIModel/submodel.hxx
@@ -115,10 +115,6 @@ private:
     submodel_vector_type       subsubmodels;
     submodel_vector_iterator   submodel_iterator, subsubmodel_iterator;
 
-    float trans[3][3];
-    float in[3];
-    float out[3];
-
     //double Rx, Ry, Rz;
     //double Sx, Sy, Sz;
     //double Tx, Ty, Tz;
@@ -142,7 +138,7 @@ private:
     double _parent_pitch;
     double _parent_roll;
     double _parent_speed;
-    double _parent_ID;
+    //double _parent_ID;
 
     double _x_offset;
     double _y_offset;

diff --git a/src/FDM/YASim/Hitch.hpp b/src/FDM/YASim/Hitch.hpp
index f14cc85b5f2d5cb931c5767979e16a6cb6d90cc7..2badeb1fc6ba784a65759432d47f5889b204c7c0 100644 (file)
--- a/src/FDM/YASim/Hitch.hpp
+++ b/src/FDM/YASim/Hitch.hpp
@@ -77,12 +77,12 @@ private:
     float _forceMagnitude;
     double _global_ground[4];
     float _global_vel[3];
-    char _name[256];
+    //char _name[256];
     State* _state;
     float _dist;
     float _timeLagCorrectedDist;
     SGPropertyNode_ptr _towEndNode;
-    const char *_towEndPropertyName;
+    //const char *_towEndPropertyName;
     bool _towEndIsConnectedToProperty;
     bool _nodeIsMultiplayer;
     bool _nodeIsAiAircraft;

diff --git a/src/FDM/YASim/TurbineEngine.hpp b/src/FDM/YASim/TurbineEngine.hpp
index ab496ebde0ed9e7f12d00dc404f5e89314af60a9..aa214d3f978993d0e9cd22bdef28f002be2cfad6 100644 (file)
--- a/src/FDM/YASim/TurbineEngine.hpp
+++ b/src/FDM/YASim/TurbineEngine.hpp
@@ -43,8 +43,8 @@ private:
 
     float _n2Min;
     float _n2Target;
-    float _torqueTarget;
-    float _fuelFlowTarget;
+    //float _torqueTarget;
+    //float _fuelFlowTarget;
 
     float _n2;
     float _rho;

diff --git a/src/Instrumentation/rnav_waypt_controller.cxx b/src/Instrumentation/rnav_waypt_controller.cxx
index d0bed4ce7f68442bce20b826407978651344a234..d487e2b3f85b3b475df19125c2af3d029e30b761 100644 (file)
--- a/src/Instrumentation/rnav_waypt_controller.cxx
+++ b/src/Instrumentation/rnav_waypt_controller.cxx
@@ -262,7 +262,6 @@ public:
        LegWayptCtl(RNAV* aRNAV, const WayptRef& aWpt) :
     WayptController(aRNAV, aWpt),
     _waypointOrigin(),
-    _distanceOriginTargetMeter(0.0),
     _distanceOriginAircraftMeter(0.0),
     _distanceAircraftTargetMeter(0.0),
     _courseOriginToAircraft(0.0),
@@ -366,7 +365,6 @@ private:
    * A(from), B(to), D(position) perhaps off course
    */
   SGGeod _waypointOrigin;
-  double _distanceOriginTargetMeter;
   double _distanceOriginAircraftMeter;
   double _distanceAircraftTargetMeter;
   double _courseOriginToAircraft;

diff --git a/src/Navaids/airways.hxx b/src/Navaids/airways.hxx
index 6942f30741175ee5e17c3b0b59f5ce49ea2f1854..8062ee41e2edb048877d7d82470a23601cb460d3 100644 (file)
--- a/src/Navaids/airways.hxx
+++ b/src/Navaids/airways.hxx
@@ -44,6 +44,12 @@ public:
   
   static void load(const SGPath& path);
   
+    double topAltitudeFt() const
+    { return _topAltitudeFt; }
+    
+    double bottomAltitudeFt() const
+    { return _bottomAltitudeFt; }
+    
   /**
    * Track a network of airways
    *