diff options
| author | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2017-09-15 16:38:08 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2017-09-15 16:38:08 +0200 |
| commit | aa31a06235496c0d808e57c8ce914cb4b640bc6e (patch) | |
| tree | 33385e828ddca0b2857bac9e3dac4dd3723a3eee /include/astra/XMLDocument.h | |
| parent | f6aa2db83dfea89f9d2cfc6fcbd3da141ee77e02 (diff) | |
| parent | 00a1c6118b2d64b867c8e640c295462bcccfc7c9 (diff) | |
| download | astra-aa31a06235496c0d808e57c8ce914cb4b640bc6e.tar.gz astra-aa31a06235496c0d808e57c8ce914cb4b640bc6e.tar.bz2 astra-aa31a06235496c0d808e57c8ce914cb4b640bc6e.tar.xz astra-aa31a06235496c0d808e57c8ce914cb4b640bc6e.zip | |
Merge branch 'master' into parallel_vec
Diffstat (limited to 'include/astra/XMLDocument.h')
| -rw-r--r-- | include/astra/XMLDocument.h | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/include/astra/XMLDocument.h b/include/astra/XMLDocument.h index eddd908..fc8b29f 100644 --- a/include/astra/XMLDocument.h +++ b/include/astra/XMLDocument.h @@ -1,10 +1,10 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp - 2014-2015, CWI, Amsterdam +Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp + 2014-2016, CWI, Amsterdam Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/ This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ You should have received a copy of the GNU General Public License along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>. ----------------------------------------------------------------------- -$Id$ */ #ifndef _INC_ASTRA_XMLDOCUMENT @@ -42,8 +41,6 @@ namespace rapidxml { #include "Globals.h" #include "XMLNode.h" -using namespace std; - namespace astra { /** This class encapsulates an XML Document of the Xerces DOM Parser. @@ -65,14 +62,14 @@ public: * @param sFilename Location of the XML file. * @return XML Document containing the DOM tree */ - static XMLDocument* readFromFile(string sFilename); + static XMLDocument* readFromFile(std::string sFilename); /** Construct an empty XML DOM tree with a specific root tag. * * @param sRootName Element name of the root tag. * @return XML Document with an empty root node */ - static XMLDocument* createDocument(string sRootName); + static XMLDocument* createDocument(std::string sRootName); /** Get the rootnode of the XML document * @@ -84,7 +81,7 @@ public: * * @param sFilename Location of the XML file. */ - void saveToFile(string sFilename); + void saveToFile(std::string sFilename); /** convert and XML DOM tree to a string */ |