Commit Graph

1168 Commits

Author SHA1 Message Date
Lee Thomason
f4520c9905 Merge pull request #762 from orbitcowboy/master
Improved const correctness. There are no functional changes intended.
2020-03-01 16:42:35 -08:00
wangli28
1eb8a3f765 Add vcpkg installation instructions 2020-02-16 04:43:09 +00:00
Daniel Stevens
22e5db1402 Remove clean before test or check
The `clean` doesn't appear to serve a purpose. Make already does
dependency tracking, so if files are out of date they will be rebuilt.

The `clean` rule does however cause problems when the test executable
already exists. In that case it will delete outputs, including the test
executable, and then fail. By the time the test executable was deleted,
it was already determined that it was up to date, and so does not get
rebuilt. You end up having to run the command twice, each time seesawing
between deleting outputs or generating outputs and running the tests.
2020-02-04 03:50:07 -07:00
Daniel Stevens
d09f879ada Add Makefile outputs to .gitignore 2020-02-04 03:05:01 -07:00
Mark Mossberg
60e96163ca cmake: Move TARGETS_EXPORT_NAME to top 2019-12-03 22:35:33 +00:00
Mark Mossberg
588c6577dd cmake: Clarify comment around exported cmake script
The `export()` command purely exports a cmake script into the build
directory; it is not related to find_package at all. It is technically
not necessary. The main use case would be a user copying it into their
internal cmake/ dir in their project, and then using `include()`'ing
that file in their cmake.

The `install(EXPORT...` command is what actually generates a cmake
module that is put on the filesystem in a location that can be found by
`find_package` when in config mode.
2019-12-03 22:27:03 +00:00
Mark Mossberg
57cd52b046 cmake: Use TARGETS_EXPORT_NAME var throughout file
Previously, it was totally unused.
2019-12-03 17:11:43 -05:00
Mark Mossberg
e86e947cb2 cmake: Use CMAKE_PROJECT_NAME instead of PROJECT_NAME
This is consistent with other usages of the file.
PROJECT_NAME is only useful if there are subprojects, and there
aren't any here.
2019-12-03 17:09:24 -05:00
ngc92
e620245043 PushNewChild* family of convenience functions 2019-12-03 16:25:53 +01:00
John Senneker
d58436c4bd Fixed bug caused by type checking code in LoadFile.
Since the file offset is now represented in all cases as a `long long`,
the previous check comparing the sizes of `unsigned long` and `size_t`
no longer makes sense.
2019-11-19 11:40:43 -05:00
John Senneker
bf59a2d4c8 Added support for files larger than ~2GB.
This implements #786.

TinyXML reads the entire file into a pre-allocated buffer in memory. To
get the buffer size, it uses `fseek()` to seek to the end of the file,
and `ftell()` to get the current byte offset. But because `ftell()`
returns a 32-bit signed value, it can only represent byte offsets, hence
file sizes, up to about 2GB.

To get around this, `fseek` and `ftell` have been replaced by the
`TIXML_FSEEK` and `TIXML_FTELL` macros, respectively, which will resolve
to 64-bit versions of these functions on platforms that have them.
2019-11-19 11:00:52 -05:00
Dan Nissenbaum
d7455034ea Change constants used in 'ToBool' to support MSVC
The tokens `TRUE` and `FALSE` are defined in current versions of MSVC, breaking compilation of tinyxml2.cpp in MSVC due to the use of these tokens as variable names in the function `XMLUtil::ToBool`.

Simply changing the variable names to something else resolves the problem.
2019-10-24 23:57:45 -04:00
Alanscut
7d9ca1e73c Supplementary test case
Update xmltest.cpp

Update xmltest.cpp
2019-09-27 16:22:49 +08:00
Alanscut
ad7bdf9ed2 fix issue#712 2019-09-21 15:51:14 +08:00
Alanscut
8916a3c587 fix wrong symbol 2019-09-16 17:03:12 +08:00
orbitcowboy
73f5409b62 Improved const correctness. There are no functional changes intended. 2019-08-14 09:30:30 +02:00
Lee Thomason
ff61650517 Merge branch 'master' of github.com:leethomason/tinyxml2 2019-08-10 18:05:53 -07:00
Lee Thomason
9c740e8d23 setting the version to 7.1.0 7.1.0 2019-08-10 18:05:22 -07:00
Lee Thomason
a9a0ea22fb Merge pull request #761 from untereiner/master
Add COMPONENT support at cmake install stage
2019-08-10 18:03:03 -07:00
Lee Thomason
50daa32fc2 minor fixes to test cases 2019-08-10 18:00:57 -07:00
Lee Thomason
f60928eaa4 Merge branch 'supplementary_test_case' of git://github.com/wangkirin/tinyxml2 into wangkirin-supplementary_test_case 2019-08-10 17:58:17 -07:00
Lee Thomason
4994f1cc57 Merge pull request #754 from wangkirin/reorg_file_path
adjust path of testfile `bomtest.xml` to `resources/out`
2019-08-10 17:54:54 -07:00
Lee Thomason
5bf58f0d1f Merge pull request #753 from orbitcowboy/master
Fixed -Wold-style-cast warnings from g++.
2019-08-10 17:53:39 -07:00
Lee Thomason
141d2117ba Merge pull request #751 from wangkirin/fix_comment
fix comment in Programmatic DOM test case
2019-08-10 17:52:25 -07:00
Lee Thomason
87aaa25922 Merge pull request #750 from equalent/patch-1
Fixed typos
2019-08-10 17:51:46 -07:00
Lee Thomason
c3601c62f6 Merge branch 'cugone-master' 2019-08-10 17:50:53 -07:00
Lee Thomason
effdf95f8c add test cases 2019-08-10 17:49:42 -07:00
Lee Thomason
c36d59f6b5 Merge branch 'master' of git://github.com/cugone/tinyxml2 into cugone-master 2019-08-10 17:40:46 -07:00
Lee Thomason
7fd646a8a2 support more bool options 2019-08-10 17:40:19 -07:00
Lee Thomason
1675bec2f2 Merge pull request #743 from deduktionstheorem/master
Issue 742: allow intermittent calls of XMLPrinter::ClearBuffer
2019-08-10 17:35:08 -07:00
Lionel Untereiner
d39b13bbb7 Add COMPONENT support at cmake install stage
It enables a per component install / packaging with cmake / cpack (but not mandatory)
2019-07-24 12:56:51 +02:00
wangkirin
f12d7a241f Supplement test case in xmltest.cpp 2019-07-03 14:48:44 +08:00
Wang Kirin
e08c2d2e0e adjust path of testfile bomtest.xml to resource/out 2019-05-30 15:25:04 +08:00
cugone
38f7d65b4a Merge pull request #1 from aaronkirkham/master
added uint64_t methods to XMLPrinter
2019-05-21 21:05:36 -05:00
aaronkirkham07@gmail.com
c341cea501 add missing uint64_t methods to XMLPrinter
add missing XMLElement::Unsigned64Attribute body
2019-05-22 00:05:27 +01:00
orbitcowboy
710a3324f4 Fixed -Wold-style-cast warnings from g++. 2019-05-16 15:30:47 +02:00
Wang Kirin
4add958b49 fix comment in Programmatic DOM test case 2019-04-29 09:54:45 +08:00
Andrey Tsurkan
eda7f81b1f Fixed typos 2019-04-25 17:35:17 +03:00
cugone
1dbfe31858 Missing uint64_t XMLElement::Unsigned64Text(uint64_t defaultValue) implementation 2019-04-12 17:33:49 -05:00
cugone
47e229e189 Forgot Text and XMLElement versions; 2019-04-12 17:27:28 -05:00
cugone
75a5acc6bb UnsignedInt64 support 2019-04-11 22:03:43 -05:00
Lee Thomason
61a4c7d507 Merge branch 'master' of github.com:leethomason/tinyxml2 2019-03-17 18:19:04 -07:00
Lee Thomason
db39dbc0fd add license and minor readme edit 2019-03-17 18:18:20 -07:00
Lee Thomason
eb2b8c47c4 Merge pull request #732 from orbitcowboy/master
Improved const correctness of local variables. There are no functiona…
2019-03-17 17:33:27 -07:00
Lee Thomason
bd5a1414df Merge pull request #731 from aarnchng/cmake_verspec
CMakeList.txt: fix wrong version
2019-03-17 17:32:20 -07:00
Stephan Friedrichs
e1b3013182 Issue 742: allow intermittent calls of XMLPrinter::ClearBuffer
XMLPrinter::ClearBuffer shouldn't set _firstElement to true, unless
called after the document is completely generated. Otherwise, the
layout of the XML file is messed up when the buffer is flushed
intermittently. This commit enables this using a default-initialized
parameter, chosen such that the existing behavior remains uneffected.
2019-03-07 21:30:23 +01:00
orbitcowboy
0e7f289590 Improved const correctness of local variables. There are no functional changes intended. 2019-01-15 11:28:49 +01:00
Aaron Yong
f5641e5470 CMakeList.txt: fix wrong version
Using find_package() with version argument, CMake return wrong version error. This commit resolves this.
2019-01-15 10:52:59 +08:00
Lee Thomason
8f4a9a8cc2 Merge pull request #721 from MortenMacFly/master
* removed merge artefact from Doxygen control file
2018-11-18 17:28:58 -08:00
Morten MacFly
d944ef762f * removed merge artifact from Doxygen control file 2018-11-18 08:23:51 +01:00