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

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

diff --git a/src/FDM/JSBSim/FGConfigFile.h b/src/FDM/JSBSim/FGConfigFile.h
index ffcb29fb2a23dd439254d32ab5c4e11444c44eb1..f415210d842faf1007ba349f85513235b8e23433 100644 (file)
--- a/src/FDM/JSBSim/FGConfigFile.h
+++ b/src/FDM/JSBSim/FGConfigFile.h
@@ -44,15 +44,13 @@ INCLUDES
 #  include STL_FSTREAM
 #  include STL_IOSTREAM
    SG_USING_STD(string);
-#  if !defined(SG_HAVE_NATIVE_SGI_COMPILERS)
-     SG_USING_STD(ostream);
-     SG_USING_STD(istream);
-     SG_USING_STD(ifstream);
-     SG_USING_STD(cerr);
-     SG_USING_STD(endl);
-     SG_USING_STD(ios);
-     SG_USING_STD(cout);
-#  endif
+   SG_USING_STD(ostream);
+   SG_USING_STD(istream);
+   SG_USING_STD(ifstream);
+   SG_USING_STD(cerr);
+   SG_USING_STD(endl);
+   SG_USING_STD(ios);
+   SG_USING_STD(cout);
 #else
 #  include <string>
 #  if defined(sgi) && !defined(__GNUC__)
@@ -106,6 +104,8 @@ CLASS DOCUMENTATION
 CLASS DECLARATION
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
+namespace JSBSim {
+
 class FGConfigFile : public FGJSBBase
 {
 public:
@@ -120,6 +120,8 @@ public:
       @return the next valid line from the config file OR "EOF" if end of file is
       reached.*/
   string GetNextConfigLine(void);
+  
+  string GetCurrentLine(void) { return CurrentLine; }
 
   /** Returns the value of the tag supplied.
       @param 
@@ -132,7 +134,6 @@ public:
   FGConfigFile& operator>>(double&);
   FGConfigFile& operator>>(int&);
   FGConfigFile& operator>>(string&);
-  FGConfigFile& operator>>(eParam&);
   void ResetLineIndexToZero(void);
 
 private:
@@ -147,7 +148,7 @@ private:
 
   void Debug(int from);
 };
-
+}
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 #endif