Latest JSBSim changes.

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

diff --git a/src/FDM/JSBSim/FGMatrix.h b/src/FDM/JSBSim/FGMatrix.h
index c34dac64d7cf738df98884f1b9e53a80533b35b8..9d46522e3f1096f05231b9a01714bc2856e0b576 100644 (file)
--- a/src/FDM/JSBSim/FGMatrix.h
+++ b/src/FDM/JSBSim/FGMatrix.h
@@ -22,21 +22,18 @@ INCLUDES
 
 #include <stdlib.h>
 #ifdef FGFS
+#  include <math.h>
 #  include <simgear/compiler.h>
 #  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(endl);
-#  ifdef FG_HAVE_STD_INCLUDES
-#    include <fstream>
-#    include <cmath>
-#    include <iostream>
-#  else
-#    include <fstream.h>
-#    include <math.h>
-#    include <iostream.h>
+#  if !defined(SG_HAVE_NATIVE_SGI_COMPILERS)
+     SG_USING_STD(ostream);
+     SG_USING_STD(istream);
+     SG_USING_STD(cerr);
+     SG_USING_STD(cout);
+     SG_USING_STD(endl);
 #  endif
 #else
 #  include <fstream>
@@ -47,6 +44,7 @@ INCLUDES
    using std::ostream;
    using std::istream;
    using std::cerr;
+   using std::cout;
    using std::endl;
 #endif
 
@@ -142,7 +140,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);
@@ -154,7 +152,7 @@ public:
 
   double& operator()(int m) const;
 
-  FGColumnVector& multElementWise(const FGColumnVector& V);
+  FGColumnVector multElementWise(const FGColumnVector& V);
 
 private:
   void Debug(void);