Removed the 'using::std' instructions from the headers as per James Turner request.

Also took this opportunity to add a check in XMLVisitor::savePosition() against a null pointer.

diff --git a/simgear/xml/easyxml.cxx b/simgear/xml/easyxml.cxx
index bdb1358b46e5ba626da5cce88abcd7eff86fe6f2..2a6953593df74132e08ec779a71511ad5618afd2 100644 (file)
--- a/simgear/xml/easyxml.cxx
+++ b/simgear/xml/easyxml.cxx
@@ -24,7 +24,8 @@
 #include <iostream>
 
 using std::ifstream;
-
+using std::istream;
+using std::string;
 
 \f
 ////////////////////////////////////////////////////////////////////////
@@ -140,8 +141,10 @@ XMLAttributesDefault::setValue (const char * name, const char * value)
 
 void XMLVisitor::savePosition(void)
 {
-  column = XML_GetCurrentColumnNumber(parser);
-  line = XML_GetCurrentLineNumber(parser);
+  if (parser) {
+    column = XML_GetCurrentColumnNumber(parser);
+    line = XML_GetCurrentLineNumber(parser);
+  }
 }
 
 ////////////////////////////////////////////////////////////////////////

diff --git a/simgear/xml/easyxml.hxx b/simgear/xml/easyxml.hxx
index 92a5c95bbe8e0c17d36ce0542ba8d16dc8a8f4b5..7f0c916e2e20642a8988dd8ec22d3c5e979c4f5f 100644 (file)
--- a/simgear/xml/easyxml.hxx
+++ b/simgear/xml/easyxml.hxx
@@ -15,10 +15,6 @@
 #include <string>
 #include <vector>
 
-using std::istream;
-using std::string;
-using std::vector;
-
 typedef struct XML_ParserStruct* XML_Parser;
 
 /**
@@ -221,7 +217,7 @@ public:
   virtual void setValue (const char * name, const char * value);
 
 private:
-  vector<string> _atts;
+  std::vector<std::string> _atts;
 };
 
 ////////////////////////////////////////////////////////////////////////
@@ -385,7 +381,7 @@ public:
    * @param _path The path to the parsed file.
    * @see #getPath
    */
-  void setPath(const string& _path) { path = _path; }
+  void setPath(const std::string& _path) { path = _path; }
 
   /** Get the path to the parsed file.
    *
@@ -397,7 +393,7 @@ public:
    * @return the path to the parsed file.
    * @see #setPath
    */
-  const string& getPath(void) const { return path; }
+  const std::string& getPath(void) const { return path; }
 
   /** Save the current position in the parsed file.
    *
@@ -448,7 +444,7 @@ public:
   void setParser(XML_Parser _parser) { parser = _parser; }
 private:
   XML_Parser parser;
-  string path;
+  std::string path;
   int line, column;
 };
 
@@ -472,8 +468,8 @@ private:
  * is a problem reading the file.
  * @see XMLVisitor
  */
-extern void readXML (istream &input, XMLVisitor &visitor,
-                    const string &path="");
+extern void readXML (std::istream &input, XMLVisitor &visitor,
+                    const std::string &path="");
 
 
 /**
@@ -494,7 +490,7 @@ extern void readXML (istream &input, XMLVisitor &visitor,
  * is a problem reading the file.
  * @see XMLVisitor
  */
-extern void readXML (const string &path, XMLVisitor &visitor);
+extern void readXML (const std::string &path, XMLVisitor &visitor);
 
 
 /**