2301 Commits

Author SHA1 Message Date
Steve Hanson
221e8d5364 revert perftest 2021-01-29 11:38:33 +00:00
Steve Hanson
f89e75af75 remove C++ 11 std::string to_string() syntax 2021-01-29 11:08:01 +00:00
Steve Hanson
c491dd5213 remove C++ 11 enum syntax 2021-01-29 10:26:05 +00:00
Steve Hanson
6f3cccd6e1 remove debug std::cout, handle empty error object in example 2021-01-28 14:21:36 +00:00
Steve Hanson
05e7b33977 code and tests 2021-01-28 12:11:43 +00:00
Steve Hanson
5d17b24e53
Merge pull request #1 from Tencent/master
PR for commits 2021/01/12
2021-01-12 14:54:16 +00:00
Milo Yip
585042c02b
Merge pull request #1821 from slsyy/master
Add implicit conversion from Object and Array to Value (#1404)
2021-01-06 13:43:21 +08:00
Krystian Chmura
cbf62de55d Add implicit conversion from Object and Array to Value (#1404)
Allows resolution of JSON Pointer on Object and Array
2021-01-05 14:20:57 +01:00
Milo Yip
3cdd3c8370
Merge pull request #1817 from lukedan/lukedan_cpp20
Fix #1721
2020-12-28 10:32:35 +08:00
Xuanyi Zhou
5e50f27ed1 also initialize class member 2020-12-26 23:41:42 -05:00
Xuanyi Zhou
1e4f59d3ae add return statement & comment 2020-12-26 23:38:27 -05:00
Xuanyi Zhou
d742a030aa add body to private copy constructor & copy assignment 2020-12-26 23:27:43 -05:00
Xuanyi Zhou
3006926231 suppress enum bitwise operation warnings on msvc 2020-12-26 23:09:39 -05:00
Xuanyi Zhou
13f5ab4f44 fix schema test compile error 2020-12-26 22:58:13 -05:00
Milo Yip
56f215e5c3
Merge pull request #1568 from ericrannaud/ericrannaud/memberiterator-public
Make GenericMemberIterator::Iterator public again (RAPIDJSON_NOMEMBER…
2020-12-23 09:41:20 +08:00
Milo Yip
0ccdbf364c
Merge pull request #1786 from ssb22/master
Remove unnecessary wording from BSD license not needed for MIT license (fixes #528)
2020-10-13 09:54:06 +08:00
Silas S. Brown
b7734d97c0 Remove unnecessary wording from BSD license not needed for MIT license (fixes #528) 2020-10-09 10:04:27 +01:00
Milo Yip
ce81bc9edf
Merge pull request #1760 from escherstair/fix_ce6_support
fix _BitScanReverse() usage for CE6
2020-08-07 10:12:21 +08:00
escherstair
5fbf8bf89c fix unit test 2020-08-06 15:55:42 +02:00
escherstair
7f559ec80a fix naive implementation for clzll() 2020-08-06 15:55:26 +02:00
escherstair
58e2964856 add unit test for clzll() 2020-08-06 14:57:39 +02:00
escherstair
aa5dd60865 fix naive version implementation 2020-08-04 14:39:19 +02:00
escherstair
91940e84b1 fallback to the naive version for CE6 2020-08-04 14:38:45 +02:00
escherstair
6364c8e5ab fix _BitScanReverse() usage for CE6 2020-08-04 10:01:44 +02:00
Milo Yip
f56928de85
Merge pull request #1744 from lklein53/improve-surrogate-handling
Improve surrogate handling (#1738)
2020-07-13 11:10:39 +08:00
Lars Klein
6694c996b9 Add test case for low surrogate handling 2020-07-04 14:48:55 +02:00
Lars Klein
ed73d7bdb4 Improve surrogate handling
Report a single low surrogate as kParseErrorStringUnicodeSurrogateInvalid.
2020-07-04 14:34:09 +02:00
Milo Yip
88bd956d66
Merge pull request #1453 from eidosmontreal/custom_malloc
Adding a single customization point that ensures all allocations within rapidjson can be performed with a custom memory allocator
2020-06-23 14:34:10 +08:00
Gaspard Petit
004e8e61a0 Merge branch 'master' into custom_malloc 2020-06-22 22:31:37 -04:00
Milo Yip
1a803826f1
Merge pull request #1720 from madeso/master
Fixes issue #1718
2020-05-19 00:25:35 +08:00
Gustav
ac0fc79c76 Fixes issue #1718 2020-05-18 14:06:39 +02:00
Milo Yip
8f4c021fa2
Merge pull request #1689 from g199209/master
Add CMake minimum version required.
2020-04-10 17:34:09 +08:00
Gao Mingfei
1ce28f454b Add CMake minimum version required.
Interface Libraries feature is not available before CMake 3.0

Signed-off-by: Gao Mingfei <mingfei.gao@ucloud.cn>
2020-04-10 14:50:51 +08:00
Matteo Settenvini
f376690822
Add a target to RapidJSONConfig.cmake.in (#1350)
This way, users can call target_link_libraries against the imported target, which is the recommended way of doing things.
2020-03-30 10:29:56 +08:00
Jun
234ff044f4
ci: upgrade distro to xenial and add arm64 test cases (#1662)
Start from xenial, Travis supports multiple CPU architectures.
To bump to this version allows expand test coverage for more
architectures.
See: https://docs.travis-ci.com/user/reference/overview/#virtualisation-environment-vs-operating-system
Add arm64 test cases to matrix.

Change-Id: If61e2d38223dad70b542d6ec0afcf4a433c9debf
Signed-off-by: Jun He <jun.he@arm.com>

Co-authored-by: Jun He <jun.he@arm.com>
2020-03-30 10:24:11 +08:00
ioannis-e
36481c30b3
Update Visual Studio Visualizer (#1665)
1. Determine the correct type of string based on encoding
2. Omit string pointer address
2020-03-30 10:22:52 +08:00
仓鼠
d4f03d0d04
Doc: Fix some typos. (#1675) 2020-03-30 10:21:37 +08:00
Nikolay
ebcbd04484
Three-way comparison for CLang 10 fix (#1679)
C++20 features must enable additional functionality, not to change interface completely
2020-03-30 10:20:35 +08:00
Romain Geissler @ Amadeus
2661a17c7e
Avoid warnings when using -std=c++20 and clang 10: use three way comparision for iterators when possible. (#1667)
/data/mwrep/res/osp/RapidJson/20-0-0-0/include/rapidjson/document.h:729:58: error: use of overloaded operator '!=' is ambiguous (with operand types 'rapidjson::GenericValue<rapidjson::UTF8<char>, rapidjson::MemoryPoolAllocator<rapidjson::CrtAllocator> >::MemberIterator' (aka 'rapidjson::GenericMemberIterator<false, rapidjson::UTF8<char>, rapidjson::MemoryPoolAllocator<rapidjson::CrtAllocator> >') and 'rapidjson::GenericValue<rapidjson::UTF8<char>, rapidjson::MemoryPoolAllocator<rapidjson::CrtAllocator> >::MemberIterator')
                for (MemberIterator m = MemberBegin(); m != MemberEnd(); ++m)
2020-03-20 13:39:48 +08:00
Jun
814bb27bf0
Replace RAPIDJSON_CLZLL with internal clzll (#1660)
RAPIDJSON_CLZLL is defined as macro of __builtin_clzll when
using gcc to compile. This introduces two issues:
1. in gcc __builtin_clzll returns int, not uint32_t.
2. __builtin_clzll return is undefined when input x is 0
See: https://gcc.gnu.org/onlinedocs/gcc/Other-Builtins.html

This patch removes RAPIDJSON_CLZLL, merges __builtin_clzll to
internal clzll with input check and return value explicit cast.

Change-Id: Iac4b355dc5e5b4ed9b3f35a640b6b5537e76f22c
Signed-off-by: Jun He <jun.he@arm.com>

Co-authored-by: Jun He <jun.he@arm.com>
2020-03-11 15:11:25 +08:00
Milo Yip
563fe5bbbe
PrettyWriter constructor uninitialized member (#1654)
Fix #1653
2020-03-05 14:13:11 +08:00
Milo Yip
2bed293f48
Update biginteger.h (#1652)
Fix intel compiler macro
de6681e295 (commitcomment-37645051)
2020-03-05 11:06:01 +08:00
mdamle
b16cec1a1a
Closes #1643 (#1644)
This change comes up with compile time pre-processor directives to
tune the behavior of rapidjson wrt memory consumption. The idea is to
allow each module using this library to choose the right defaults based
on how it consumes memory and what performance it expects.

1. RAPIDJSON_DEFAULT_ALLOCATOR: If defined allows you to choose
	CrtAllocator over MemoryPoolAllocator. If it is not defined, chooses MemoryPoolAllocator by default.
2. RAPIDJSON_DEFAULT_STACK_ALLOCATOR: If defined allows you to choose
	MemoryPoolAllocator over CrtAllocator. If it is not defined, chooses CrtAllocator by default.
3. RAPIDJSON_VALUE_DEFAULT_OBJECT_CAPACITY and RAPIDJSON_VALUE_DEFAULT_ARRAY_CAPACITY: If defined and set to a
	value, uses that value for default number of objects/array elements to be pre-allocated. If not defined,
	uses value of 16: the current default.

Verified that all tests pass.
2020-02-25 11:34:28 +08:00
Tim Gates
98f52b6bb0
Fix simple typo: drived -> derived (#1646)
Closes #1645
2020-02-21 15:46:10 +08:00
xpahos
a895ce150f
Allow escaped apostrophe in values (#1639)
* Allow escaped apostrophe in values

* Allow escaped apostrophe in values

* Canonical flag name

* Add translation for escaped apostrophe

Co-authored-by: Milo Yip <miloyip@gmail.com>
2020-02-13 09:53:15 +08:00
Milo Yip
418331e99f
Merge pull request #1631 from PhoebeHui/dev/Phoebe/vcpkg_instructions
Add vcpkg installation instructions
2020-01-17 09:55:44 +08:00
PhoebeHui
b4cf6e7381 Add vcpkg installation instructions 2020-01-16 03:09:20 -08:00
Milo Yip
dfbe1db9da
Merge pull request #1502 from ylavic/compilation_fixes
Compilation fixes
2019-12-03 09:51:05 +08:00
Milo Yip
eeb9d553f8
Merge pull request #1617 from JPEWdev/master
Remove shadow typedef
2019-12-03 09:49:40 +08:00
Joshua Watt
134af9d811 Remove shadow typedef
Removes a duplicate and identical typedef that was causing a
'declaration shadows typedef' (-Wshadow) warning in clang.
2019-12-02 09:19:16 -06:00