Updates from JSBSim, including new turbine engine model from David Culp

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

diff --git a/src/FDM/JSBSim/FGFCS.h b/src/FDM/JSBSim/FGFCS.h
index a5387de279f929a61cd1bf32688d16b4605830db..c2f560b47254fb0152e6e57bded32ed85de9bdef 100644 (file)
--- a/src/FDM/JSBSim/FGFCS.h
+++ b/src/FDM/JSBSim/FGFCS.h
@@ -65,6 +65,8 @@ DEFINITIONS
 FORWARD DECLARATIONS
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
+namespace JSBSim {
+
 typedef enum { iDe=0, iDaL, iDaR, iDr, iDsb, iDsp, iDf, NNorm } FcIdx;
 typedef enum { ofRad=0, ofNorm, ofMag , NForms} OutputForm;
 
@@ -613,7 +615,7 @@ public:
   
   void bind(void);
   void bindModel(void);
-  void unbind(void);
+  void unbind(FGPropertyManager *node);
   
 private:
   double DaCmd, DeCmd, DrCmd, DfCmd, DsbCmd, DspCmd;
@@ -644,8 +646,7 @@ private:
   int ToNormalize[NNorm];
   void Debug(int from);
 };
-
-#include "FGState.h"
+}
 
 #endif