X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=src%2FFDM%2FJSBSim%2FFGTank.cpp;h=93092c15979d7c3ed67b26c4d52d52ff7dcac976;hb=f63d336ebcc5318a83a4db15a73a7c77cc192d53;hp=83d85744ffc62ed83b9029f8f8afe3bdb561df6d;hpb=cc0ec0b07067af6803ac8b5d23bfd74c9b2b0386;p=flightgear.git

diff --git a/src/FDM/JSBSim/FGTank.cpp b/src/FDM/JSBSim/FGTank.cpp
index 83d85744f..93092c159 100644
--- 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;
@@ -54,16 +54,16 @@ CLASS IMPLEMENTATION
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
 FGTank::FGTank(FGConfigFile* AC_cfg)
-    : Contents(-1.0)
 {
   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;
@@ -71,11 +71,12 @@ FGTank::FGTank(FGConfigFile* AC_cfg)
     else if (token == "ZLOC") *AC_cfg >> Z;
     else if (token == "RADIUS") *AC_cfg >> Radius;
     else if (token == "CAPACITY") *AC_cfg >> Capacity;
-    else if (token == "CONTENTS") {
-        if (Contents == -1.0) *AC_cfg >> Contents;
-    } else cerr << "Unknown identifier: " << token << " in tank definition." << endl;
+    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) {
@@ -83,7 +84,7 @@ FGTank::FGTank(FGConfigFile* AC_cfg)
   } else {
     Contents = 0;
     PctFull  = 0;
-  }     
+  }
 
   Debug(0);
 }
@@ -139,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;
     }
   }