Commit Graph

1089 Commits

Author SHA1 Message Date
Lee Thomason
18468b8cc4 minor changes to hex parsing 2020-06-13 17:35:21 -07:00
Lee Thomason
c9c9d8cdfa Merge branch 'master' of https://github.com/netcan/tinyxml2 into netcan-master 2020-06-13 17:26:30 -07:00
Lee Thomason
bfbcc0333d Merge pull request #809 from a-lunkov/patch-1
Fix for build with FreeBSD
2020-03-31 15:09:26 -07:00
Lee Thomason
99db0247d6 Merge pull request #807 from jsenn/sharpen-ftell-ifdef
Sharpened check for 64-bit Unix when defining fseek/ftell macros.
2020-03-31 15:08:42 -07:00
a-lunkov
63fb154ad3 Update tinyxml2.cpp 2020-03-24 14:30:52 +03:00
John Senneker
1fdee25d11 Sharpened check for 64-bit Unix when defining fseek/ftell macros.
This fixes the issues with VxWorks, as mentioned by @razr in #786.
2020-03-17 14:11:25 -04:00
Lee Thomason
bd5950bb02 Merge pull request #798 from DanRStevens/removeCleanBeforeTest
Remove `clean` before `test` or `check`
2020-03-10 14:28:21 -07:00
Lee Thomason
67271b1fd2 Merge pull request #787 from jsenn/feature/large-file-support
Added support for files larger than ~2GB
2020-03-10 14:21:04 -07:00
John Senneker
a9f29b74d9 Fixed warning caused by sloppy conversion between signed/unsigned types.
Also, the comparison between size_t max and the actual file size is done
as an unsigned long long, since that type is guaranteed to be at least
64 bits, even on a 32-bit architecture.
2020-03-02 11:04:57 -05:00
netcan
dfb45cb73b support IntText(),UnsignedText(),Int64Text() for hex value 2020-03-02 22:26:03 +08:00
Lee Thomason
bf15233ad8 Setting the version to 8.0.0 8.0.0 2020-03-01 17:40:07 -08:00
Lee Thomason
8504195843 fix vs version 2020-03-01 17:23:36 -08:00
Lee Thomason
8db004b74c Merge pull request #802 from LilyWangL/vcpkg-instructions
Add vcpkg installation instructions
2020-03-01 17:20:53 -08:00
Lee Thomason
3d6a5477a7 Merge pull request #797 from DanRStevens/gitIgnoreLinux
Add Makefile outputs to .gitignore
2020-03-01 17:12:24 -08:00
Lee Thomason
bbbb8c9a90 Merge branch 'master' of github.com:leethomason/tinyxml2 2020-03-01 17:11:07 -08:00
Lee Thomason
e444268103 add convenience methods 2020-03-01 17:10:38 -08:00
Lee Thomason
6ac05b2b9a Merge branch 'push' of https://github.com/ngc92/tinyxml2 into ngc92-push 2020-03-01 17:01:33 -08:00
Lee Thomason
655b15c078 Merge pull request #781 from daniel347x/patch-1
Change constants used in 'ToBool' to support MSVC
2020-03-01 16:53:40 -08:00
Lee Thomason
59b01033f3 Merge branch 'Alanscut-tinyxml2_addtestcase' 2020-03-01 16:53:00 -08:00
Lee Thomason
37ccc71008 fix some casting 2020-03-01 16:52:42 -08:00
Lee Thomason
3574d3e22f Merge branch 'tinyxml2_addtestcase' of https://github.com/Alanscut/tinyxml2 into Alanscut-tinyxml2_addtestcase 2020-03-01 16:49:10 -08:00
Lee Thomason
de62366e6a Merge branch 'master' of github.com:leethomason/tinyxml2 2020-03-01 16:47:26 -08:00
Lee Thomason
20f2d5eec7 Merge pull request #773 from Alanscut/fix_issue712
fix issue#712
2020-03-01 16:47:19 -08:00
Lee Thomason
a9c28ce3e3 Merge pull request #768 from Alanscut/fix_wrong_symbol
Fix wrong symbol in comment
2020-03-01 16:46:48 -08:00
Lee Thomason
2c642bf25e update to visstudio 2019 2020-03-01 16:46:30 -08:00
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
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