Merge branch 'next' of D:\Git_New\flightgear into next

[flightgear.git] / src / FDM / JSBSim / input_output / FGXMLFileRead.h

diff --git a/src/FDM/JSBSim/input_output/FGXMLFileRead.h b/src/FDM/JSBSim/input_output/FGXMLFileRead.h
old mode 100755 (executable)
new mode 100644 (file)
index ce33d8c..d7366db
--- a/src/FDM/JSBSim/input_output/FGXMLFileRead.h
+++ b/src/FDM/JSBSim/input_output/FGXMLFileRead.h
@@ -35,13 +35,15 @@ SENTRY
 INCLUDES
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-#include <input_output/FGXMLParse.h>
+#include "input_output/FGXMLParse.h"
+#include <iostream>
+#include <fstream>
 
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 DEFINITIONS
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-#define ID_XMLFILEREAD "$Id$"
+#define ID_XMLFILEREAD "$Id: FGXMLFileRead.h,v 1.5 2009/11/28 20:12:47 andgi Exp $"
 
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 FORWARD DECLARATIONS
@@ -56,23 +58,23 @@ public:
 
 protected:
   Element* document;
-  Element* LoadXMLDocument(string XML_filename)
+  Element* LoadXMLDocument(std::string XML_filename)
   {
-    ifstream infile;
+    std::ifstream infile;
 
     if ( !XML_filename.empty() ) {
-      if (XML_filename.find(".xml") == string::npos) XML_filename += ".xml";
+      if (XML_filename.find(".xml") == std::string::npos) XML_filename += ".xml";
       infile.open(XML_filename.c_str());
       if ( !infile.is_open()) {
-        cerr << "Could not open file: " << XML_filename << endl;
+        std::cerr << "Could not open file: " << XML_filename << std::endl;
         return 0L;
       }
     } else {
-      cerr << "No filename given." << endl;
+      std::cerr << "No filename given." << std::endl;
       return 0L;
     }
 
-    readXML(infile, file_parser);
+    readXML(infile, file_parser, XML_filename);
     document = file_parser.GetDocument();
     infile.close();