haraldwolff/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2024-07-16 11:23:07 +02:00
Code Issues Packages Projects Releases Wiki Activity
3649 commits 12 branches 56 tags 226 MiB
Commit graph

533 commits

Author SHA1 Message Date
Niels Lohmann 3a80823ff8
🔀 merge develop branch and resolve conflicts 2020-07-11 13:21:13 +02:00
Niels Lohmann 9c21285133
Merge branch 'develop' of https://github.com/nlohmann/json into issue2179 
 Conflicts:
	single_include/nlohmann/json.hpp
 2020-07-11 13:20:16 +02:00
gatopeich f9a1fec272
Remove redundant comment 2020-07-11 00:34:02 +01:00
gatopeich f62b4626be Removing comment about AllocatorType per review request 2020-07-09 21:12:14 +01:00
Niels Lohmann 4c7bd014d9
Merge pull request #2242 from nlohmann/issue2239 
Make assert configurable via JSON_ASSERT
 2020-07-09 15:13:12 +02:00
Niels Lohmann e3e9ccfc02
🚑 fix regression from #2181 2020-07-08 14:02:28 +02:00
Niels Lohmann 98b1c6d302
🚩 use JSON_ASSERT(x) instead of assert(x) 2020-07-06 12:22:31 +02:00
Niels Lohmann b04dc055b2
Merge pull request #2233 from nlohmann/issue2175 
Add specialization of get_to
 2020-07-06 07:58:52 +02:00
Agustín F. Pozuelo 25f5d75e6e Fix compilation for xcode 9.x 2020-07-03 01:44:18 +01:00
Agustín F. Pozuelo 93770467a1 Precisely 4 template arguments for the sake of clang 3.6 (?) 2020-07-03 01:28:54 +01:00
Agustín F. Pozuelo 0fc261f0f2 Make ordered_map compatible with GCC 5.5 2020-07-03 00:33:31 +01:00
Niels Lohmann c7e079cc98
🚑 add specialization of get_to #2175 2020-06-30 14:26:52 +02:00
Niels Lohmann ad6eadeb70
📝 refine documentation of error_handler parameter 2020-06-30 13:59:43 +02:00
gatopeich 49f26a0250 Have 4 template parameters for ordered_map 2020-06-29 17:32:55 +01:00
Niels Lohmann eb7376bb13
Merge pull request #2225 from nlohmann/issue2175 
Simplify conversion from/to custom types
 2020-06-29 14:41:09 +02:00
Niels Lohmann fa9f4040df
🔥 remove unused typedefs #2221 2020-06-27 13:07:02 +02:00
Niels Lohmann 3948b5b091
Merge pull request #2212 from nlohmann/comments 
Add option to ignore comments in parse/accept functions
 2020-06-27 12:44:51 +02:00
Niels Lohmann c5ee222982
Merge pull request #2211 from nlohmann/fix_warnings 
Fix Clang-Tidy warnings
 2020-06-27 12:34:18 +02:00
Niels Lohmann 635b9a0ae4
Merge pull request #2193 from dota17/issue#2059 
Fix consistency in function `int_to_string()`
 2020-06-24 11:46:48 +02:00
gatopeich d08fca2bb9 Use const Key in ordered map 
(forgotten in previous commit!)
 2020-06-23 15:44:46 +01:00
gatopeich 5e7bdf1cab Roll-back to hard-coded object_t::value_type 2020-06-23 15:39:00 +01:00
gatopeich fb8c11f25c Re-implement ordered_map::erase, 
so that it can handle pair<const Key,...>
 2020-06-23 15:01:20 +01:00
gatopeich acd748e16f Use std::map default allocator as a placeholder 
to extract the actual ObjectType::value_type
Still fails on older compilers (GCC <= 5.5)
 2020-06-23 12:03:21 +01:00
gatopeich 49623a75ee Revert "Using ordered_json instead of fifo_map in test-regression" 
This reverts commit 5fe3d3929a.
 2020-06-23 11:30:52 +01:00
Niels Lohmann 8575fdf9ad
Merge pull request #2181 from dota17/issue#1275 
Fix issue#1275
 2020-06-23 09:23:03 +02:00
Niels Lohmann 4bfe4add20
Merge pull request #2203 from t-b/use-unsigned-indizies-for-array-index-in-json-pointer 
Use unsigned indizies for array index in json pointer
 2020-06-23 09:16:01 +02:00
chenguoping 0ecf297457 drop std::enable_if part 2020-06-23 09:14:55 +08:00
Niels Lohmann a9809f3381
🏁 revert change that breaks with MSVC 2020-06-22 23:02:28 +02:00
Niels Lohmann 8b3d2399a4
🚨 remove warnings 2020-06-22 22:32:21 +02:00
gatopeich 5fe3d3929a Using ordered_json instead of fifo_map in test-regression 
This is more comprehensive and the "my_workaround_fifo_map" wrapper does not allow to infer value type as required in this branch.

This reverts commit 064a9c9212.
 2020-06-22 19:10:35 +01:00
gatopeich 064a9c9212 Fix regression test 2020-06-22 18:59:19 +01:00
gatopeich ddf0a45abb Use AllocatorType<ObjectType::value_type>, 
instead of hard-coding it for std::map's value_type
 2020-06-22 18:35:46 +01:00
chenguoping aeef50709e to allow for ADL in int_to_string() function 2020-06-22 20:17:56 +08:00
Thomas Braun ecbb2756fd json_pointer::array_index: Use unsigned values for the array index when parsing 
The current code uses std::stoi to convert the input string to an int
array_index. This limits the maximum addressable array size to ~2GB on
most platforms.

But all callers immediately convert the result of array_index to
BasicJsonType::size_type.

So let's parse it as unsigned long long, which allows us to have as
big arrays as available memory. And also makes the call sites nicer to
read.

One complication arises on platforms where size_type is smaller than
unsigned long long. We need to bail out on these if the parsed array
index does not fit into size_type.
 2020-06-22 13:42:55 +02:00
Niels Lohmann 65e8ee985a
🔨 clean up 2020-06-22 08:59:03 +02:00
gatopeich 15337b2cc3 Ignore allocator hardcoded to match std::map 2020-06-22 00:03:48 +01:00
gatopeich 27aaf6f845 Clean-up ordered_map declarations 2020-06-21 22:28:03 +01:00
Niels Lohmann 29ad2178c6
Merge pull request #2176 from gracicot/cpp20-support-no-std-fct-templ-specialization 
C++20 support by removing swap specialization
 2020-06-21 20:39:58 +02:00
Niels Lohmann e22ce45065
🚸 improve diagnostics 2020-06-21 13:28:00 +02:00
Niels Lohmann 139a0258cc
Merge branch 'develop' of https://github.com/nlohmann/json into comments 2020-06-21 12:40:21 +02:00
Thomas Braun f0e73163f2 json_pointer.hpp: Mention more exception in documentation 
Forgotten in dcd3a6c6 (move the catch of std::invalid_argument into
array_index(), 2020-03-23).
 2020-06-20 15:27:22 +02:00
Niels Lohmann 0fe9f23254
✨ add macros from #2175 2020-06-20 14:11:37 +02:00
Niels Lohmann 6ee9e5f402
⚗️ remove const from value type 2020-06-20 13:23:44 +02:00
Niels Lohmann 4fd0d02b6f
🚧 toward an ordered_json type 2020-06-19 15:27:05 +02:00
Niels Lohmann b64002bbca
♻️ extract common code to function 2020-06-19 13:24:08 +02:00
Niels Lohmann 0585ecc56b
✅ add tests for comment skipping 2020-06-19 13:10:35 +02:00
Niels Lohmann 74520d8bb0
🚧 extend API 2020-06-17 22:03:14 +02:00
Niels Lohmann 88a37010d6
🐛 serialize 32-bit floating-point numbers as float 32 in MessagePack (0xCA) #2196 2020-06-17 21:14:23 +02:00
Niels Lohmann e9bfcf7255
⚡ improve comment parsing 2020-06-17 14:59:47 +02:00
chenguoping 4a6c68c7eb drop new blank line 2020-06-17 20:44:31 +08:00