FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Also took this opportunity to add a check in XMLVisitor::savePosition() against a null pointer.
This commit is contained in:
bcoconni
2013-11-11 19:06:44 +01:00
committed by James Turner
parent 5d7d0a922d
commit c64776029e
2 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
simgear/xml/easyxml.cxx
View File

@@ -24,7 +24,8 @@
#include <iostream>
using std::ifstream;
using std::istream;
using std::string;
////////////////////////////////////////////////////////////////////////
@@ -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);
}
}
////////////////////////////////////////////////////////////////////////

18
simgear/xml/easyxml.hxx
View File

@@ -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);
/**