Curt Olson:

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

diff --git a/src/FDM/JSBSim/FGTank.cpp b/src/FDM/JSBSim/FGTank.cpp
index 55b7d09ecdc54804551063a2389f16e61715ca82..ea56e13f426ae1f1bbad4dfeb2179e737f5d952f 100644 (file)
--- a/src/FDM/JSBSim/FGTank.cpp
+++ b/src/FDM/JSBSim/FGTank.cpp
@@ -38,6 +38,14 @@ INCLUDES
 
 #include "FGTank.h"
 
+#if !defined ( sgi ) || defined( __GNUC__ ) && (_COMPILER_VERSION < 740)
+using std::cerr;
+using std::endl;
+using std::cout;
+#endif
+
+namespace JSBSim {
+
 static const char *IdSrc = "$Id$";
 static const char *IdHdr = ID_TANK;
 
@@ -45,12 +53,6 @@ static const char *IdHdr = ID_TANK;
 CLASS IMPLEMENTATION
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-#if !defined ( sgi ) || defined( __GNUC__ )
-using std::cerr;
-using std::endl;
-using std::cout;
-#endif
-
 FGTank::FGTank(FGConfigFile* AC_cfg)
 {
   string token;
@@ -95,19 +97,17 @@ FGTank::~FGTank()
 
 double FGTank::Reduce(double used)
 {
-  double shortage;
+  double shortage = Contents - used;
 
-  if (used < Contents) {
+  if (shortage >= 0) {
     Contents -= used;
     PctFull = 100.0*Contents/Capacity;
-    return 0.0;
   } else {
-    shortage = Contents - used;
     Contents = 0.0;
     PctFull = 0.0;
     Selected = false;
-    return shortage;
   }
+  return shortage;
 }
 
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -158,4 +158,4 @@ void FGTank::Debug(int from)
     }
   }
 }
-
+}