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
49623a75ee
Revert "Using ordered_json instead of fifo_map in test-regression"
...
This reverts commit 5fe3d3929a
2020-06-23 11:30:52 +01:00
8575fdf9ad
Merge pull request #2181 from dota17/issue#1275
...
Fix issue#1275
2020-06-23 09:23:03 +02:00
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
0ecf297457
drop std::enable_if part
2020-06-23 09:14:55 +08:00
a9809f3381
🏁 revert change that breaks with MSVC
2020-06-22 23:02:28 +02:00
8b3d2399a4
🚨 remove warnings
2020-06-22 22:32:21 +02:00
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
064a9c9212
Fix regression test
2020-06-22 18:59:19 +01:00
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
aeef50709e
to allow for ADL in int_to_string() function
2020-06-22 20:17:56 +08:00
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
65e8ee985a
🔨 clean up
2020-06-22 08:59:03 +02:00
15337b2cc3
Ignore allocator hardcoded to match std::map
2020-06-22 00:03:48 +01:00
27aaf6f845
Clean-up ordered_map declarations
2020-06-21 22:28:03 +01:00
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
e22ce45065
🚸 improve diagnostics
2020-06-21 13:28:00 +02:00
139a0258cc
Merge branch 'develop' of https://github.com/nlohmann/json into comments
2020-06-21 12:40:21 +02:00
f0e73163f2
json_pointer.hpp: Mention more exception in documentation
...
Forgotten in dcd3a6c6
2020-06-20 15:27:22 +02:00
0fe9f23254
✨ add macros from #2175
2020-06-20 14:11:37 +02:00
6ee9e5f402
⚗️ remove const from value type
2020-06-20 13:23:44 +02:00
4fd0d02b6f
🚧 toward an ordered_json type
2020-06-19 15:27:05 +02:00
b64002bbca
♻️ extract common code to function
2020-06-19 13:24:08 +02:00
0585ecc56b
✅ add tests for comment skipping
2020-06-19 13:10:35 +02:00
74520d8bb0
🚧 extend API
2020-06-17 22:03:14 +02:00
88a37010d6
🐛 serialize 32-bit floating-point numbers as float 32 in MessagePack (0xCA) #2196
2020-06-17 21:14:23 +02:00
e9bfcf7255
⚡ improve comment parsing
2020-06-17 14:59:47 +02:00
4a6c68c7eb
drop new blank line
2020-06-17 20:44:31 +08:00
8aaa4013a3
remove overload function, change default_value to rvalue
2020-06-17 15:05:28 +08:00
b53c6e2f81
✨ ignore comments
2020-06-16 12:28:59 +02:00
691fb0c57a
fix issue#2059
2020-06-16 15:35:26 +08:00
5f862710fe
🔖 set version to 3.8.0
2020-06-14 17:16:45 +02:00
71830be06d
fix issue#1275
2020-06-10 19:27:28 +08:00
ae04426c85
🏁 fix for MSVC (see https://github.com/nlohmann/json/pull/2178#issuecomment-640622532 )
2020-06-08 20:07:15 +02:00
6d73126ea9
🚨 fix warnings
2020-06-07 22:47:25 +02:00
8c1d26e186
📝 add documentation and example for accept function
2020-06-07 20:59:43 +02:00
907803189b
🏁 fix MSVC 2015 compilation
2020-06-07 12:51:33 +02:00
225c8f150a
Disable std::swap specialization in C++20 and added a friend swap function
2020-06-06 11:36:39 -04:00
bf2e714e96
🚨 fix warnings
2020-06-06 14:30:17 +02:00
7444c7fa25
Merge pull request #2145 from FrancoisChabot/1813-user-input
...
Fix Issue#1813: user defined input adapters
2020-06-05 14:30:39 +02:00
0498202a03
🎨 replace alternative operators (and, not, or)
2020-06-03 14:20:36 +02:00
4350c5ed97
fix bug in issue#1972
2020-05-30 17:15:56 +08:00
b715a70673
changed macro order to satisfy clang
2020-05-28 12:26:29 -04:00
7646253940
fix inconsistent fwd declaration
2020-05-28 12:20:02 -04:00
ce3143a038
use correct deprecation macro
2020-05-28 12:16:10 -04:00
d575534471
brought back the from_*(ptr, len) syntax with a deprecation warning
2020-05-28 12:13:43 -04:00
dcf6175978
use the correct convention for boolean operators
2020-05-28 09:29:38 -04:00
61832afe15
Merge pull request #2144 from XyFreak/gcc10_type_limits
...
Fix issue#1939: Cast character to unsigned for comparison
2020-05-28 12:59:57 +02:00
a4f1cf4d00
better parse documentation
2020-05-28 02:50:58 -04:00
76b49f9ee6
misc formatting fixes
2020-05-28 02:29:53 -04:00
gatopeich
Niels Lohmann
chenguoping
Niels Lohmann
Thomas Braun
Guillaume Racicot
Francois Chabot