Merge pull request #230 from antonindrawan/master

Compile TinyXml2 with the Dinkum C++ of QNX 6.5 and QNX 6.6.
This commit is contained in:
Lee Thomason 2014-11-27 22:34:34 -08:00
commit 2114e47453
3 changed files with 5 additions and 4 deletions

View File

@ -24,7 +24,7 @@ distribution.
#include "tinyxml2.h"
#include <new> // yes, this one new style header, is in the Android SDK.
# ifdef ANDROID_NDK
#if defined(ANDROID_NDK) || defined(__QNXNTO__)
# include <stddef.h>
#else
# include <cstddef>

View File

@ -24,7 +24,7 @@ distribution.
#ifndef TINYXML2_INCLUDED
#define TINYXML2_INCLUDED
#if defined(ANDROID_NDK) || defined(__BORLANDC__)
#if defined(ANDROID_NDK) || defined(__BORLANDC__) || defined(__QNXNTO__)
# include <ctype.h>
# include <limits.h>
# include <stdio.h>

View File

@ -23,6 +23,7 @@
#endif
using namespace tinyxml2;
using namespace std;
int gPass = 0;
int gFail = 0;
@ -298,10 +299,10 @@ int main( int argc, const char ** argv )
XMLDocument* doc = new XMLDocument();
clock_t startTime = clock();
doc->LoadFile( argv[1] );
clock_t loadTime = clock();
clock_t loadTime = clock();
int errorID = doc->ErrorID();
delete doc; doc = 0;
clock_t deleteTime = clock();
clock_t deleteTime = clock();
printf( "Test file '%s' loaded. ErrorID=%d\n", argv[1], errorID );
if ( !errorID ) {