Updates from JSBSim, including new turbine engine model from David Culp

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

diff --git a/src/FDM/JSBSim/FGTable.h b/src/FDM/JSBSim/FGTable.h
index 5ca46308329e8a2ef3c027808097386ee003033d..483e945b5cb6126480d39b5c9ddb2013fd8ad408 100644 (file)
--- a/src/FDM/JSBSim/FGTable.h
+++ b/src/FDM/JSBSim/FGTable.h
@@ -76,6 +76,8 @@ CLASS DECLARATION
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
 
+namespace JSBSim {
+
 class FGTable : public FGJSBBase
 {
 public:
@@ -100,8 +102,6 @@ public:
   FGTable& operator<<(const int n);
   inline double GetElement(int r, int c) {return Data[r][c];}
   void Print(void);
-  template <class T> T Clamp(T lower, T value, T upper)
-    {return value < lower ? lower : (value > upper ? upper : value);}
 
 private:
   enum type {tt1D, tt2D} Type;
@@ -109,10 +109,11 @@ private:
   int nRows, nCols;
   int colCounter;
   int rowCounter;
+  int lastRowIndex, lastColumnIndex;
   double** Allocate(void);
   void Debug(int from);
 };
-
+}
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 #endif