JSBSim tweaks.

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

diff --git a/src/FDM/JSBSim/FGMatrix.h b/src/FDM/JSBSim/FGMatrix.h
index 068be0fff8a3e0566db3820bbb4abc5278f74227..99673444ed604c2f8f37b2813fc04424bd460b03 100644 (file)
--- a/src/FDM/JSBSim/FGMatrix.h
+++ b/src/FDM/JSBSim/FGMatrix.h
@@ -22,23 +22,30 @@ INCLUDES
 
 #include <stdlib.h>
 #ifdef FGFS
+#  include <math.h>
 #  include <simgear/compiler.h>
-#  ifdef FG_HAVE_STD_INCLUDES
-#    include <fstream>
-#    include <cmath>
-#    include <iostream>
-#  else
-#    include <fstream.h>
-#    include <math.h>
-#    include <iostream.h>
-#  endif
+#  include STL_STRING
+#  include STL_FSTREAM
+#  include STL_IOSTREAM
+   SG_USING_STD(string);
+   SG_USING_STD(ostream);
+   SG_USING_STD(istream);
+   SG_USING_STD(cerr);
+   SG_USING_STD(cout);
+   SG_USING_STD(endl);
 #else
 #  include <fstream>
 #  include <cmath>
 #  include <iostream>
+#  include <string>
+   using std::string;
+   using std::ostream;
+   using std::istream;
+   using std::cerr;
+   using std::cout;
+   using std::endl;
 #endif
 
-#include <string>
 
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 DEFINITIONS
@@ -46,12 +53,6 @@ DEFINITIONS
 
 #define ID_MATRIX "$Id$"
 
-using std::string;
-using std::ostream;
-using std::istream;
-using std::cerr;
-using std::endl;
-
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 FORWARD DECLARATIONS
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -137,7 +138,7 @@ public:
   ~FGColumnVector(void);
 
   FGColumnVector operator*(const double scalar);
-  FGColumnVector& operator*(const FGColumnVector& V);   // Cross product operator
+  FGColumnVector operator*(const FGColumnVector& V);   // Cross product operator
   FGColumnVector operator/(const double scalar);
   FGColumnVector operator+(const FGColumnVector& B); // must not return reference
   FGColumnVector operator-(const FGColumnVector& B);
@@ -148,45 +149,12 @@ public:
   friend FGColumnVector operator*(const FGMatrix& M, const FGColumnVector& V);
 
   double& operator()(int m) const;
-  
-  FGColumnVector& multElementWise(const FGColumnVector& V);
+
+  FGColumnVector multElementWise(const FGColumnVector& V);
 
 private:
   void Debug(void);
 };
 
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-DECLARATION: FGMatrix3x3
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-class FGMatrix3x3 : public FGMatrix
-{
-public:
-  FGMatrix3x3(void) {FGMatrix(3,3);}
-//  ~FGMatrix3x3(void) {~FGMatrix();}
-};
-
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-DECLARATION: FGColumnVector4
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-class FGColumnVector4 : public FGColumnVector
-{
-public:
-  FGColumnVector4(void) {FGColumnVector(4);}
-//  ~FGColumnVector4(void) {~FGColumnVector();}
-};
-
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-DECLARATION: FGColumnVector3
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-class FGColumnVector3 : public FGColumnVector
-{
-public:
-  FGColumnVector3(void) {FGColumnVector(3);}
-//  ~FGColumnVector3(void) {~FGColumnVector();}
-};
-
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 #endif