Compiler warning fixes and small updates

diff --git a/src/ATC/AILocalTraffic.hxx b/src/ATC/AILocalTraffic.hxx
index 0d97a2e677db69e2f229e9dc6d225f7170855023..611349cb0850be74a1545a5f45d0634cf08f6cc2 100644 (file)
--- a/src/ATC/AILocalTraffic.hxx
+++ b/src/ATC/AILocalTraffic.hxx
@@ -35,7 +35,7 @@
 #include <string>
 SG_USING_STD(string);
 
-typedef enum PatternLeg {
+enum PatternLeg {
        TAKEOFF_ROLL,
        CLIMBOUT,
        TURN1,
@@ -49,20 +49,20 @@ typedef enum PatternLeg {
        LANDING_ROLL
 };
 
-typedef enum TaxiState {
+enum TaxiState {
        TD_INBOUND,
        TD_OUTBOUND,
        TD_NONE
 };
 
-typedef enum OperatingState {
+enum OperatingState {
        IN_PATTERN,
        TAXIING,
        PARKED
 };
 
 // perhaps we could use an FGRunway instead of this
-typedef struct RunwayDetails {
+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)
@@ -74,7 +74,7 @@ typedef struct RunwayDetails {
        string rwyID;
 };
 
-typedef struct StartofDescent {
+struct StartofDescent {
        PatternLeg leg;
        double orthopos_x;
        double orthopos_y;

diff --git a/src/ATC/ground.hxx b/src/ATC/ground.hxx
index fdc2dd0eafab1a2385d546520e22329feb90dc49..d15fbc2a79da3759579d0585122b778f582fa4bf 100644 (file)
--- a/src/ATC/ground.hxx
+++ b/src/ATC/ground.hxx
@@ -43,12 +43,12 @@ SG_USING_STD(list);
 
 //////////////////////////////////////////////////////
 // Types for the logical network data structure
-typedef enum arc_type {
+enum arc_type {
        RUNWAY,
        TAXIWAY
 };
 
-typedef enum node_type {
+enum node_type {
        GATE,
        APRON,
        HOLD,
@@ -70,7 +70,7 @@ enum GateType {
        OTHER   // ie. anything goes!!
 };
 
-typedef enum network_element_type {
+enum network_element_type {
        NODE,
        ARC
 };

diff --git a/src/FDM/JSBSim/filtersjb/FGCondition.cpp b/src/FDM/JSBSim/filtersjb/FGCondition.cpp
index bf2677dffb7a7dc1cc70d039620f0170d36f9788..e9cb9be0a0ea1898d4a23f8e0559348c8468b949 100644 (file)
--- a/src/FDM/JSBSim/filtersjb/FGCondition.cpp
+++ b/src/FDM/JSBSim/filtersjb/FGCondition.cpp
@@ -92,7 +92,7 @@ FGCondition::FGCondition(FGConfigFile* AC_cfg, FGPropertyManager* PropertyManage
     else if (AC_cfg->GetValue("LOGIC") == "AND") Logic = eAND;
 
     AC_cfg->GetNextConfigLine();
-    while (AC_cfg->GetValue() != "/CONDITION_GROUP") {
+    while (AC_cfg->GetValue() != string("/CONDITION_GROUP")) {
       conditions.push_back(*(new FGCondition(AC_cfg, PropertyManager)));
     }
     isGroup = true;

diff --git a/src/FDM/JSBSim/filtersjb/FGSwitch.cpp b/src/FDM/JSBSim/filtersjb/FGSwitch.cpp
index c4df95dca647ab60c1bfd22780093e0b7c3afb2e..0cc64a217a40f982fa2d6ab724479fbc7a7ba681 100644 (file)
--- a/src/FDM/JSBSim/filtersjb/FGSwitch.cpp
+++ b/src/FDM/JSBSim/filtersjb/FGSwitch.cpp
@@ -115,7 +115,7 @@ FGSwitch::FGSwitch(FGFCS* fcs, FGConfigFile* AC_cfg) : FGFCSComponent(fcs),
       }
 
       AC_cfg->GetNextConfigLine();
-      while (AC_cfg->GetValue() != "/TEST") {
+      while (AC_cfg->GetValue() != string("/TEST")) {
         current_test->conditions.push_back(*(new FGCondition(AC_cfg, PropertyManager)));
       }
     }

diff --git a/src/FDM/flight.cxx b/src/FDM/flight.cxx
index cd4e4fddb9a8196a0b2d171f6ecda640d6ea8353..808da0580ee0e768d9e6749ef52a0f777249bb80 100644 (file)
--- a/src/FDM/flight.cxx
+++ b/src/FDM/flight.cxx
@@ -448,6 +448,7 @@ FGInterface::unbind ()
   fgUntie("/orientation/pitch-deg");
   fgUntie("/orientation/heading-deg");
   fgUntie("/velocities/airspeed-kt");
+  fgUntie("/velocities/mach");
   fgUntie("/velocities/speed-north-fps");
   fgUntie("/velocities/speed-east-fps");
   fgUntie("/velocities/speed-down-fps");

diff --git a/src/Main/fgfs.cxx b/src/Main/fgfs.cxx
index 46bb96ef67604310134e13e62a2edaa2220e80d2..c92e995267766e0e7ae734ecbdc88ad21fc05631 100644 (file)
--- a/src/Main/fgfs.cxx
+++ b/src/Main/fgfs.cxx
@@ -80,56 +80,56 @@ FGSubsystemGroup::FGSubsystemGroup ()
 
 FGSubsystemGroup::~FGSubsystemGroup ()
 {
-    for (int i = 0; i < _members.size(); i++)
+    for (unsigned int i = 0; i < _members.size(); i++)
         delete _members[i];
 }
 
 void
 FGSubsystemGroup::init ()
 {
-    for (int i = 0; i < _members.size(); i++)
+    for (unsigned int i = 0; i < _members.size(); i++)
         _members[i]->subsystem->init();
 }
 
 void
 FGSubsystemGroup::reinit ()
 {
-    for (int i = 0; i < _members.size(); i++)
+    for (unsigned int i = 0; i < _members.size(); i++)
         _members[i]->subsystem->reinit();
 }
 
 void
 FGSubsystemGroup::bind ()
 {
-    for (int i = 0; i < _members.size(); i++)
+    for (unsigned int i = 0; i < _members.size(); i++)
         _members[i]->subsystem->bind();
 }
 
 void
 FGSubsystemGroup::unbind ()
 {
-    for (int i = 0; i < _members.size(); i++)
+    for (unsigned int i = 0; i < _members.size(); i++)
         _members[i]->subsystem->unbind();
 }
 
 void
 FGSubsystemGroup::update (double delta_time_sec)
 {
-    for (int i = 0; i < _members.size(); i++)
+    for (unsigned int i = 0; i < _members.size(); i++)
         _members[i]->update(delta_time_sec); // indirect call
 }
 
 void
 FGSubsystemGroup::suspend ()
 {
-    for (int i = 0; i < _members.size(); i++)
+    for (unsigned int i = 0; i < _members.size(); i++)
         _members[i]->subsystem->suspend();
 }
 
 void
 FGSubsystemGroup::resume ()
 {
-    for (int i = 0; i < _members.size(); i++)
+    for (unsigned int i = 0; i < _members.size(); i++)
         _members[i]->subsystem->resume();
 }
 
@@ -164,7 +164,7 @@ FGSubsystemGroup::get_subsystem (const string &name)
 void
 FGSubsystemGroup::remove_subsystem (const string &name)
 {
-    for (int i = 0; i < _members.size(); i++) {
+    for (unsigned int i = 0; i < _members.size(); i++) {
         if (name == _members[i]->name) {
             _members.erase(_members.begin() + i);
             return;
@@ -181,7 +181,7 @@ FGSubsystemGroup::has_subsystem (const string &name) const
 FGSubsystemGroup::Member *
 FGSubsystemGroup::get_member (const string &name, bool create)
 {
-    for (int i = 0; i < _members.size(); i++) {
+    for (unsigned int i = 0; i < _members.size(); i++) {
         if (_members[i]->name == name)
             return _members[i];
     }