April 25 updates to JSBsim by Jon.

diff --git a/src/FDM/JSBSim/FGPosition.h b/src/FDM/JSBSim/FGPosition.h
index 0bff7bbfb4249b9ce06821ec42b087c351318837..1041630d384daf224a85dfa22b3b765382b24b1b 100644 (file)
--- a/src/FDM/JSBSim/FGPosition.h
+++ b/src/FDM/JSBSim/FGPosition.h
@@ -72,9 +72,9 @@ public:
 
   inline FGColumnVector GetVel(void) {return vVel;}
   inline FGColumnVector GetUVW(void) {return vUVW;}
-  inline FGColumnVector GetVn(void)  {return vVel(1);}
-  inline FGColumnVector GetVe(void)  {return vVel(2);}
-  inline FGColumnVector GetVd(void)  {return vVel(3);}
+  inline float GetVn(void)  {return vVel(1);}
+  inline float GetVe(void)  {return vVel(2);}
+  inline float GetVd(void)  {return vVel(3);}
 
   bool Run(void);
 };

diff --git a/src/FDM/JSBSim/FGTranslation.h b/src/FDM/JSBSim/FGTranslation.h
index 62f298bd74314476412a9e7cb46360c0f9fa0000..2d3a0b53d38c3606f428bbcfc0d41efc8ec4be9f 100644 (file)
--- a/src/FDM/JSBSim/FGTranslation.h
+++ b/src/FDM/JSBSim/FGTranslation.h
@@ -88,7 +88,7 @@ public:
    inline float Getbeta (void) {return beta; }
    inline float Getgamma(void) {return gamma;}
 
-   inline void SetUVW(FGColumnVector tt) {vUVW = tt;}
+   void SetUVW(FGColumnVector tt) {vUVW = tt;}
 
    inline void Setalpha(float tt) {alpha = tt;}
    inline void Setbeta (float tt) {beta  = tt;}

diff --git a/src/FDM/JSBSim/JSBSim.cpp b/src/FDM/JSBSim/JSBSim.cpp
index 1b8f3c831356991959d4311b5d12033de4c2a337..2a5cd5823387fb7e5d93e37163d1eecdf8d84827 100644 (file)
--- a/src/FDM/JSBSim/JSBSim.cpp
+++ b/src/FDM/JSBSim/JSBSim.cpp
@@ -39,7 +39,7 @@ HISTORY
 INCLUDES
 *******************************************************************************/
 
-#if __BCPLUSPLUS__  >= 0x0540   // If compiling under Borland C++Builder
+#if __BCPLUSPLUS__  == 0x0540   // If compiling under Borland C++Builder
 #pragma hdrstop
 #include <condefs.h>
 USEUNIT("FGUtility.cpp");

diff --git a/src/FDM/JSBSim/filtersjb/FGFCSComponent.h b/src/FDM/JSBSim/filtersjb/FGFCSComponent.h
index 65a3fa4e499e3ff44a53e130d56955b706893045..2b0f3b77b843090006cd8eac532dc741dbfbf302 100644 (file)
--- a/src/FDM/JSBSim/filtersjb/FGFCSComponent.h
+++ b/src/FDM/JSBSim/filtersjb/FGFCSComponent.h
@@ -81,7 +81,7 @@ protected:
 
 public:
   FGFCSComponent(FGFCS*);
-  ~FGFCSComponent ( ) { }       //Destructor
+  virtual ~FGFCSComponent ( ) { }       //Destructor
 
   virtual bool Run (void);
   virtual void SetOutput(void);