Sync. with JSBSim CVS.

[flightgear.git] / src / FDM / JSBSim / FGTank.cpp

diff --git a/src/FDM/JSBSim/FGTank.cpp b/src/FDM/JSBSim/FGTank.cpp
index 664b6b4ce006108c85c02b4329f65b0de2e10351..93092c15979d7c3ed67b26c4d52d52ff7dcac976 100644 (file)
--- a/src/FDM/JSBSim/FGTank.cpp
+++ b/src/FDM/JSBSim/FGTank.cpp
@@ -38,7 +38,7 @@ INCLUDES
 
 #include "FGTank.h"
 
-#if !defined ( sgi ) || defined( __GNUC__ )
+#if !defined ( sgi ) || defined( __GNUC__ ) && (_COMPILER_VERSION < 740)
 using std::cerr;
 using std::endl;
 using std::cout;
@@ -56,13 +56,14 @@ CLASS IMPLEMENTATION
 FGTank::FGTank(FGConfigFile* AC_cfg)
 {
   string token;
-  
+  double X, Y, Z;
+
   type = AC_cfg->GetValue("TYPE");
 
   if      (type == "FUEL")     Type = ttFUEL;
   else if (type == "OXIDIZER") Type = ttOXIDIZER;
   else                         Type = ttUNKNOWN;
-  
+
   AC_cfg->GetNextConfigLine();
   while ((token = AC_cfg->GetValue()) != string("/AC_TANK")) {
     if (token == "XLOC") *AC_cfg >> X;
@@ -73,7 +74,9 @@ FGTank::FGTank(FGConfigFile* AC_cfg)
     else if (token == "CONTENTS") *AC_cfg >> Contents;
     else cerr << "Unknown identifier: " << token << " in tank definition." << endl;
   }
-  
+
+  vXYZ << X << Y << Z;
+
   Selected = true;
 
   if (Capacity != 0) {
@@ -81,7 +84,7 @@ FGTank::FGTank(FGConfigFile* AC_cfg)
   } else {
     Contents = 0;
     PctFull  = 0;
-  }     
+  }
 
   Debug(0);
 }
@@ -137,7 +140,7 @@ void FGTank::Debug(int from)
     if (from == 0) { // Constructor
       cout << "      " << type << " tank holds " << Capacity << " lbs. " << type << endl;
       cout << "      currently at " << PctFull << "% of maximum capacity" << endl;
-      cout << "      Tank location (X, Y, Z): " << X << ", " << Y << ", " << Z << endl;
+      cout << "      Tank location (X, Y, Z): " << vXYZ(eX) << ", " << vXYZ(eY) << ", " << vXYZ(eZ) << endl;
       cout << "      Effective radius: " << Radius << " inches" << endl;
     }
   }