Encapsulate the interpolstion version of FGEnvironment and fix some bugs

[flightgear.git] / src / FDM / JSBSim / FGTable.cpp

diff --git a/src/FDM/JSBSim/FGTable.cpp b/src/FDM/JSBSim/FGTable.cpp
index 248ca8ebd04038f75bee46e2c1d27f880bb2cae5..5dbbadb99ceb09bad37c3bac74c3da8843498ce7 100644 (file)
--- a/src/FDM/JSBSim/FGTable.cpp
+++ b/src/FDM/JSBSim/FGTable.cpp
@@ -38,12 +38,16 @@ INCLUDES
 
 #include "FGTable.h"
 
-#if defined ( sgi ) && !defined( __GNUC__ )
+#if defined ( sgi ) && !defined( __GNUC__ ) && (_COMPILER_VERSION < 740)
 #include <iomanip.h>
 #else
 #include <iomanip>
 #endif
 
+using namespace std;
+
+namespace JSBSim {
+
 static const char *IdSrc = "$Id$";
 static const char *IdHdr = ID_TABLE;
 
@@ -51,7 +55,6 @@ static const char *IdHdr = ID_TABLE;
 CLASS IMPLEMENTATION
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-using namespace std;
 
 FGTable::FGTable(int NRows, int NCols) : nRows(NRows), nCols(NCols)
 {
@@ -246,7 +249,7 @@ void FGTable::Print(void)
   if (Type == tt1D) startRow = 1;
   else startRow = 0;
 
-#if defined (sgi) && !defined(__GNUC__)
+#if defined (sgi) && !defined(__GNUC__) && (_COMPILER_VERSION < 740)
   unsigned long flags = cout.setf(ios::fixed);
 #else
   ios::fmtflags flags = cout.setf(ios::fixed); // set up output stream
@@ -313,6 +316,4 @@ void FGTable::Debug(int from)
     }
   }
 }
-
-
-
+}