Fixes to jsbsim.

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

diff --git a/src/FDM/JSBSim/FGTank.h b/src/FDM/JSBSim/FGTank.h
index a329ffb50f62e8e14b37750c782c8cab1f98842a..167c815e374bf34a2f67a6fc8978fd31995247b2 100644 (file)
--- a/src/FDM/JSBSim/FGTank.h
+++ b/src/FDM/JSBSim/FGTank.h
@@ -43,25 +43,17 @@ SENTRY
 /*******************************************************************************
 INCLUDES
 *******************************************************************************/
+
 #ifdef FGFS
-#  include <Include/compiler.h>
-#  include STL_STRING
-#  ifdef FG_HAVE_STD_INCLUDES
-#    include <fstream>
-#  else
-#    include <fstream.h>
-#  endif
-   FG_USING_STD(string);
-#else
-#  include <string>
-#  include <fstream>
+#  include <simgear/compiler.h>
 #endif
 
+#include <string>
+#include "FGConfigFile.h"
+
 /*******************************************************************************
 DEFINES
 *******************************************************************************/
- 
-using namespace std;
 
 /*******************************************************************************
 CLASS DECLARATION
@@ -70,7 +62,7 @@ CLASS DECLARATION
 class FGTank
 {
 public:
-  FGTank(ifstream&);
+  FGTank(FGConfigFile*);
   ~FGTank(void);
 
   float Reduce(float);
@@ -83,7 +75,7 @@ public:
   float inline GetZ(void) {return Z;}
 
   enum TankType {ttUNKNOWN, ttFUEL, ttOXIDIZER};
-  
+
 private:
   TankType Type;
   float X, Y, Z;