commit 2eb7003763b856931a3f0899d733d62dfcece921
author Guillermo A. Amaral <g@maral.me> Tue Mar 20 11:26:57 2012 -0700
committer Guillermo A. Amaral <g@maral.me> Tue Mar 20 11:51:40 2012 -0700
tree 3fb976136a9464068e0ed22cf06e6f115b05b000
parent b42ba366d8148d6db4dda9ec02a4a6c33ef52729

Misc adjustments and enum rename

Updated to use C++ headers
Fixed MSVC2010 collision
Added Makefile for xmltest (unix)

xmltest.cpp

diff --git a/xmltest.cpp b/xmltest.cpp
index ac5931b..7332ba0 100644
--- a/xmltest.cpp
+++ b/xmltest.cpp
@@ -1,9 +1,8 @@
 #include "tinyxml2.h"

 

-#include <stdio.h>

-#include <stdlib.h>

-#include <string.h>

-#include <time.h>

+#include <cstdlib>

+#include <cstring>

+#include <ctime>

 

 #if defined( _MSC_VER )

 	#include <crtdbg.h>

@@ -72,7 +71,7 @@
 }

 

 

-int main( int /*argc*/, const char* /*argv*/ )

+int main( int /*argc*/, const char ** /*argv*/ )

 {

 	#if defined( _MSC_VER ) && defined( DEBUG )

 		_CrtMemCheckpoint( &startMemState );

@@ -170,7 +169,7 @@
 		XMLTest( "Programmatic DOM", true, doc->FirstChildElement()->FirstChildElement()->BoolAttribute( "attrib" ) );

 		int value = 10;

 		int result = doc->FirstChildElement()->LastChildElement()->QueryIntAttribute( "attrib", &value );

-		XMLTest( "Programmatic DOM", result, NO_ATTRIBUTE );

+		XMLTest( "Programmatic DOM", result, XML_NO_ATTRIBUTE );

 		XMLTest( "Programmatic DOM", value, 10 );

 

 		doc->Print();

@@ -224,7 +223,7 @@
 

 		XMLDocument doc;

 		doc.Parse( error );

-		XMLTest( "Bad XML", doc.ErrorID(), ERROR_PARSING_ATTRIBUTE );

+		XMLTest( "Bad XML", doc.ErrorID(), XML_ERROR_PARSING_ATTRIBUTE );

 	}

 

 	{

@@ -247,9 +246,9 @@
 		XMLTest( "Query attribute: double as int", result, XML_NO_ERROR );

 		XMLTest( "Query attribute: double as int", iVal, 2 );

 		result = ele->QueryIntAttribute( "attr2", &iVal );

-		XMLTest( "Query attribute: not a number", result, WRONG_ATTRIBUTE_TYPE );

+		XMLTest( "Query attribute: not a number", result, XML_WRONG_ATTRIBUTE_TYPE );

 		result = ele->QueryIntAttribute( "bar", &iVal );

-		XMLTest( "Query attribute: does not exist", result, NO_ATTRIBUTE );

+		XMLTest( "Query attribute: does not exist", result, XML_NO_ATTRIBUTE );

 	}

 

 	{

@@ -543,7 +542,7 @@
 		XMLDocument doc;

 		doc.Parse( doctype );

 		

-		XMLTest( "Parsing repeated attributes.", ERROR_PARSING_ATTRIBUTE, doc.ErrorID() );	// is an  error to tinyxml (didn't use to be, but caused issues)

+		XMLTest( "Parsing repeated attributes.", XML_ERROR_PARSING_ATTRIBUTE, doc.ErrorID() );	// is an  error to tinyxml (didn't use to be, but caused issues)

 		doc.PrintError();

 	}

 

@@ -557,11 +556,11 @@
 	}

 

 	{

-		// Empty documents should return TIXML_ERROR_PARSING_EMPTY, bug 1070717

+		// Empty documents should return TIXML_XML_ERROR_PARSING_EMPTY, bug 1070717

 		const char* str = "    ";

 		XMLDocument doc;

 		doc.Parse( str );

-		XMLTest( "Empty document error", ERROR_EMPTY_DOCUMENT, doc.ErrorID() );

+		XMLTest( "Empty document error", XML_ERROR_EMPTY_DOCUMENT, doc.ErrorID() );

 	}

 

 	{

@@ -588,7 +587,7 @@
 		xml.Parse("<x> ");

 		XMLTest("Missing end tag with trailing whitespace", xml.Error(), true);

 		xml.Parse("<x></y>");

-		XMLTest("Mismatched tags", xml.ErrorID(), ERROR_MISMATCHED_ELEMENT);

+		XMLTest("Mismatched tags", xml.ErrorID(), XML_ERROR_MISMATCHED_ELEMENT);

 	}