Fixes to jsbsim.

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

diff --git a/src/FDM/JSBSim/FGModel.h b/src/FDM/JSBSim/FGModel.h
index 621719a577c2d1ede6d1f08d60074ebb54f95c0a..c42f9075344e86cdc16df8a4182117e638526e3c 100644 (file)
--- a/src/FDM/JSBSim/FGModel.h
+++ b/src/FDM/JSBSim/FGModel.h
@@ -42,18 +42,17 @@ INCLUDES
 
 #ifdef FGFS
 #  include <simgear/compiler.h>
-#  include STL_STRING
 #  ifdef FG_HAVE_STD_INCLUDES
 #    include <iostream>
 #  else
 #    include <iostream.h>
 #  endif
-   FG_USING_STD(string);
 #else
-#  include <string>
 #  include <iostream>
 #endif
 
+#include <string>
+
 /*******************************************************************************
 DEFINES
 *******************************************************************************/
@@ -85,9 +84,17 @@ public:
   string Name;
   virtual bool Run(void);
   virtual bool InitModel(void);
-  void SetRate(int tt) {rate = tt;};
+  virtual void SetRate(int tt) {rate = tt;}
+  virtual int  GetRate(void)   {return rate;}
 
 protected:
+  enum {eU=1, eV, eW};
+  enum {eNorth=1, eEast, eDown};
+  enum {eP=1, eQ, eR};
+  enum {eL=1, eM, eN};
+  enum {eX=1, eY, eZ};
+  enum {ePhi=1, eTht, ePsi};
+
   int exe_ctr;
   int rate;