From: curt Date: Tue, 25 Apr 2000 17:42:11 +0000 (+0000) Subject: April 25 updates to JSBsim by Jon. X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=8f71890c089e4a2ca23273697a1915e044f53a00;p=flightgear.git April 25 updates to JSBsim by Jon. --- diff --git a/src/FDM/JSBSim/FGPosition.h b/src/FDM/JSBSim/FGPosition.h index 0bff7bbfb..1041630d3 100644 --- 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 62f298bd7..2d3a0b53d 100644 --- 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 1b8f3c831..2a5cd5823 100644 --- 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 USEUNIT("FGUtility.cpp"); diff --git a/src/FDM/JSBSim/filtersjb/FGFCSComponent.h b/src/FDM/JSBSim/filtersjb/FGFCSComponent.h index 65a3fa4e4..2b0f3b77b 100644 --- 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);