builddir -> srcdir so builds can be done outside the master source directory.

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

diff --git a/src/FDM/JSBSim/FGConfigFile.h b/src/FDM/JSBSim/FGConfigFile.h
index 8b40f53f72bb74b7e3d1e31c2f4f507d4c8a27a7..72da4bf0509c52e00c2102103c8bd7a5a1021f21 100644 (file)
--- a/src/FDM/JSBSim/FGConfigFile.h
+++ b/src/FDM/JSBSim/FGConfigFile.h
@@ -40,25 +40,23 @@ INCLUDES
 
 #ifdef FGFS
 #  include <simgear/compiler.h>
-#  include STL_STRING
 #  ifdef FG_HAVE_STD_INCLUDES
 #    include <fstream>
 #  else
 #    include <fstream.h>
 #  endif
-   FG_USING_STD(string);
 #else
-#  include <string>
 #  include <fstream>
 #endif
 
+#include <string>
+
 /*******************************************************************************
 DEFINES
 *******************************************************************************/
 
-#ifndef FGFS
-using namespace std;
-#endif
+using std::string;
+using std::ifstream;
 
 /*******************************************************************************
 CLASS DECLARATION
@@ -75,6 +73,7 @@ public:
   string GetValue(string);
   string GetValue(void);
   bool IsCommentLine(void);
+  bool IsOpen(void) {return Opened;}
   FGConfigFile& operator>>(double&);
   FGConfigFile& operator>>(float&);
   FGConfigFile& operator>>(int&);
@@ -87,6 +86,7 @@ private:
   ifstream cfgfile;
   string   CurrentLine;
   bool     CommentsOn;
+  bool     Opened;
   unsigned int      CurrentIndex;
 };