Attached patches remove BORLANDC, and hence SG_MATH_EXCEPTION_CLASH and SG_INCOM

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

diff --git a/src/FDM/JSBSim/FGState.h b/src/FDM/JSBSim/FGState.h
index aad679f378a9d8a2b6bf16cd5bc3bbed58d351ac..d1ca3d74ff7a803faf7cbb24facb44cbe13212fa 100644 (file)
--- a/src/FDM/JSBSim/FGState.h
+++ b/src/FDM/JSBSim/FGState.h
@@ -41,26 +41,11 @@ SENTRY
 INCLUDES
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-#ifdef FGFS
-#  include <simgear/compiler.h>
-#  ifdef SG_HAVE_STD_INCLUDES
-#    include <fstream>
-#  else
-#    include <fstream.h>
-#  endif
-#else
-#  if defined(sgi) && !defined(__GNUC__) && (_COMPILER_VERSION < 740)
-#    include <fstream.h>
-#  else
-#    include <fstream>
-#  endif
-#endif
-
+#include <fstream>
 #include <string>
 #include <map>
 #include "FGJSBBase.h"
 #include <initialization/FGInitialCondition.h>
-#include <math/FGMatrix33.h>
 #include <math/FGColumnVector3.h>
 #include <math/FGQuaternion.h>
 #include "FGFDMExec.h"
@@ -149,27 +134,15 @@ public:
     return sim_time;
   }
 
-  /** Calculates and returns the stability-to-body axis transformation matrix.
-      @return a reference to the stability-to-body transformation matrix.
-      */
-  FGMatrix33& GetTs2b(void);
-
-  /** Calculates and returns the body-to-stability axis transformation matrix.
-      @return a reference to the stability-to-body transformation matrix.
-      */
-  FGMatrix33& GetTb2s(void);
-
   /** Prints a summary of simulator state (speed, altitude,
       configuration, etc.)  */
-  void ReportState(void);
+//  void ReportState(void);
 
 private:
   double sim_time, dt;
   double saved_dt;
 
   FGFDMExec* FDMExec;
-  FGMatrix33 mTs2b;
-  FGMatrix33 mTb2s;
 
   FGAircraft* Aircraft;
   FGPropagate* Propagate;
@@ -182,7 +155,6 @@ private:
   FGPropertyManager* PropertyManager;
 
   void bind();
-  void unbind();
 
   void Debug(int from);
 };