Просмотр исходного кода

Merge pull request #230 from antonindrawan/master

Compile TinyXml2 with the Dinkum C++ of QNX 6.5 and QNX 6.6.
Lee Thomason 11 лет назад
Родитель
Сommit
2114e47453
3 измененных файлов с 5 добавлено и 4 удалено
  1. 1 1
      tinyxml2.cpp
  2. 1 1
      tinyxml2.h
  3. 3 2
      xmltest.cpp

+ 1 - 1
tinyxml2.cpp

@@ -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>

+ 1 - 1
tinyxml2.h

@@ -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>

+ 3 - 2
xmltest.cpp

@@ -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 ) {