1
0
mirror of https://github.com/leethomason/tinyxml2.git synced 2026-07-29 23:22:59 +04:00

Compare commits

...

6 Commits

Author SHA1 Message Date
Lee Thomason 57eea48c5b version to 10.1.0 2025-03-08 10:45:16 -08:00
Lee Thomason 198cb82c9b Merge pull request #1017 from luzpaz/typos-xmltest
fix typos in xmltest.cpp
2025-03-08 10:36:50 -08:00
Lee Thomason c6ab6d76e8 Merge pull request #1013 from AlbertHungGarmin/arm_compiler_error
Fix ARM Compiler build errors
2025-03-08 10:36:09 -08:00
luzpaz 008e32968f fix typos in xmltest.cpp
Found via `codespell -q 3 -S "./resources/dream.xml" -L currenty,ot,previousy,te,ue`
2025-01-25 09:51:29 -05:00
Albert Hung 0ca3584fa4 Fix ARM Compiler build errors
Fix build errors on ARM Compiler 5 (DS-5) by treating the compiler like QNX, Borland C, and the Android NDK for purposes of system header includes.
2024-12-17 10:13:57 +08:00
Lee Thomason 57ec94127b Merge pull request #1011 from leethomason/leethomason/charref2
Defensive check for UTF conversion
2024-12-09 21:47:05 -08:00
6 changed files with 9 additions and 9 deletions
+1 -1
View File
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.15) cmake_minimum_required(VERSION 3.15)
project(tinyxml2 VERSION 10.0.0) project(tinyxml2 VERSION 10.1.0)
include(CTest) include(CTest)
option(tinyxml2_BUILD_TESTING "Build tests for tinyxml2" "${BUILD_TESTING}") option(tinyxml2_BUILD_TESTING "Build tests for tinyxml2" "${BUILD_TESTING}")
+1 -1
View File
@@ -38,7 +38,7 @@ PROJECT_NAME = "TinyXML-2"
# could be handy for archiving the generated documentation or if some version # could be handy for archiving the generated documentation or if some version
# control system is used. # control system is used.
PROJECT_NUMBER = 10.0.0 PROJECT_NUMBER = 10.1.0
# Using the PROJECT_BRIEF tag one can provide an optional one line description # Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a # for a project that appears at the top of each page and should give viewer a
+1 -1
View File
@@ -22,7 +22,7 @@
project( project(
'tinyxml2', 'tinyxml2',
['cpp'], ['cpp'],
version : '10.0.0', version : '10.1.0',
meson_version : '>= 0.49.0', meson_version : '>= 0.49.0',
) )
+1 -1
View File
@@ -24,7 +24,7 @@ distribution.
#include "tinyxml2.h" #include "tinyxml2.h"
#include <new> // yes, this one new style header, is in the Android SDK. #include <new> // yes, this one new style header, is in the Android SDK.
#if defined(ANDROID_NDK) || defined(__BORLANDC__) || defined(__QNXNTO__) #if defined(ANDROID_NDK) || defined(__BORLANDC__) || defined(__QNXNTO__) || defined(__CC_ARM)
# include <stddef.h> # include <stddef.h>
# include <stdarg.h> # include <stdarg.h>
#else #else
+2 -2
View File
@@ -97,11 +97,11 @@ distribution.
http://semver.org/ http://semver.org/
*/ */
static const int TIXML2_MAJOR_VERSION = 10; static const int TIXML2_MAJOR_VERSION = 10;
static const int TIXML2_MINOR_VERSION = 0; static const int TIXML2_MINOR_VERSION = 1;
static const int TIXML2_PATCH_VERSION = 0; static const int TIXML2_PATCH_VERSION = 0;
#define TINYXML2_MAJOR_VERSION 10 #define TINYXML2_MAJOR_VERSION 10
#define TINYXML2_MINOR_VERSION 0 #define TINYXML2_MINOR_VERSION 1
#define TINYXML2_PATCH_VERSION 0 #define TINYXML2_PATCH_VERSION 0
// A fixed element depth limit is problematic. There needs to be a // A fixed element depth limit is problematic. There needs to be a
+3 -3
View File
@@ -1005,7 +1005,7 @@ int main( int argc, const char ** argv )
FILE* fp1 = fopen("resources/out/printer_1.xml", "w"); FILE* fp1 = fopen("resources/out/printer_1.xml", "w");
XMLPrinter printer(fp1); XMLPrinter printer(fp1);
printer.PushDeclaration("version = '1.0' enconding = 'utf-8'"); printer.PushDeclaration("version = '1.0' encoding = 'utf-8'");
printer.OpenElement("foo"); printer.OpenElement("foo");
printer.PushAttribute("attrib-text", "text"); printer.PushAttribute("attrib-text", "text");
@@ -1096,7 +1096,7 @@ int main( int argc, const char ** argv )
const XMLDeclaration* declaration = cdoc.FirstChild()->ToDeclaration(); const XMLDeclaration* declaration = cdoc.FirstChild()->ToDeclaration();
const char* declaration_value = declaration->Value(); const char* declaration_value = declaration->Value();
XMLTest("PushDeclaration() test", "version = '1.0' enconding = 'utf-8'", declaration_value); XMLTest("PushDeclaration() test", "version = '1.0' encoding = 'utf-8'", declaration_value);
} }
} }
@@ -2639,7 +2639,7 @@ int main( int argc, const char ** argv )
"<?xml version=\"1.0\"?>\n" // 2 DecL "<?xml version=\"1.0\"?>\n" // 2 DecL
"<root>\r\n" // 3 Element "<root>\r\n" // 3 Element
"\n" // 4 "\n" // 4
"text contining new line \n" // 5 Text "text containing new line \n" // 5 Text
" and also containing crlf \r\n" // 6 " and also containing crlf \r\n" // 6
"<sub><![CDATA[\n" // 7 Element Text "<sub><![CDATA[\n" // 7 Element Text
"cdata containing new line \n" // 8 "cdata containing new line \n" // 8