Erik Hofman: Irix build fixes.

diff --git a/src/ATC/AILocalTraffic.cxx b/src/ATC/AILocalTraffic.cxx
index a4e1b821548b62a3198eaa4e1a31be8ba72cb1e7..7339b4c84b2d2f43dc731b1b2387291cfd9a6efb 100644 (file)
--- a/src/ATC/AILocalTraffic.cxx
+++ b/src/ATC/AILocalTraffic.cxx
@@ -150,7 +150,7 @@ void FGAILocalTraffic::Init() {
 
 // Run the internal calculations
 void FGAILocalTraffic::Update(double dt) {
-    std::cout << "In FGAILocalTraffic::Update\n";
+    // cout << "In FGAILocalTraffic::Update\n";
     // Hardwire flying traffic pattern for now - eventually also needs to be able to taxi to and from runway and GA parking area.
     FlyTrafficPattern(dt);
     Transform();

diff --git a/src/FDM/JSBSim/FGPropertyManager.cpp b/src/FDM/JSBSim/FGPropertyManager.cpp
index 2a33172ad2bf63423a85031ea5baf403031c3912..bb0737afa97b6fef1e413cacbab7f1142f9c4e80 100644 (file)
--- a/src/FDM/JSBSim/FGPropertyManager.cpp
+++ b/src/FDM/JSBSim/FGPropertyManager.cpp
@@ -54,13 +54,14 @@ string FGPropertyManager::mkPropertyName(string name, bool lowercase) {
   /* do this two pass to avoid problems with characters getting skipped
      because the index changed */
 
-  for(unsigned i=0;i<name.length();i++) {
+  unsigned i;
+  for(i=0;i<name.length();i++) {
     if( lowercase && isupper(name[i]) )
       name[i]=tolower(name[i]);
     else if( isspace(name[i]) ) 
       name[i]='-';
   }
-  for(unsigned i=0;i<name.length();i++) {
+  for(i=0;i<name.length();i++) {
     if( name[i] == '/' )
       name.erase(i,1);  
   }

diff --git a/src/FDM/JSBSim/FGTurbine.cpp b/src/FDM/JSBSim/FGTurbine.cpp
index 50f086c8d8df94bbd28a6a776543966cb0237cc4..437e3401150a673c0a3c3a0bed145607c01a8122 100644 (file)
--- a/src/FDM/JSBSim/FGTurbine.cpp
+++ b/src/FDM/JSBSim/FGTurbine.cpp
@@ -197,7 +197,7 @@ bool FGTurbine::Load(FGConfigFile *Eng_cfg)
   *Eng_cfg >> token >> MaxMilThrust;
   *Eng_cfg >> token >> MaxAugThrust;
   i=0;
-  while( Eng_cfg->GetValue() != "/FG_TURBINE" && i < 10){
+  while( Eng_cfg->GetValue() != string("/FG_TURBINE") && i < 10){
     ThrustTables.push_back( new FGCoefficient(FDMExec) );
     ThrustTables.back()->Load(Eng_cfg);
     i++;