98b1c6d302
🚩 use JSON_ASSERT(x) instead of assert(x)
2020-07-06 12:22:31 +02:00
b04dc055b2
Merge pull request #2233 from nlohmann/issue2175
...
Add specialization of get_to
2020-07-06 07:58:52 +02:00
c7e079cc98
🚑 add specialization of get_to #2175
2020-06-30 14:26:52 +02:00
ad6eadeb70
📝 refine documentation of error_handler parameter
2020-06-30 13:59:43 +02:00
ac3922c7aa
Merge branch 'develop' of https://github.com/nlohmann/json into clang_windows
...
Conflicts:
include/nlohmann/detail/input/binary_reader.hpp
include/nlohmann/detail/input/input_adapters.hpp
include/nlohmann/detail/input/lexer.hpp
include/nlohmann/detail/output/binary_writer.hpp
include/nlohmann/json.hpp
single_include/nlohmann/json.hpp
2020-06-27 13:14:48 +02:00
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
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
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
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
139a0258cc
Merge branch 'develop' of https://github.com/nlohmann/json into comments
2020-06-21 12:40:21 +02:00
4fd0d02b6f
🚧 toward an ordered_json type
2020-06-19 15:27:05 +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
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
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
8c1d26e186
📝 add documentation and example for accept function
2020-06-07 20:59:43 +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
0498202a03
🎨 replace alternative operators (and, not, or)
2020-06-03 14:20:36 +02:00
b715a70673
changed macro order to satisfy clang
2020-05-28 12:26:29 -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
a4f1cf4d00
better parse documentation
2020-05-28 02:50:58 -04:00
76b49f9ee6
misc formatting fixes
2020-05-28 02:29:53 -04:00
f1969e60a3
reamalgamate
2020-05-27 12:56:26 -04:00
5684d9a498
unified input API
2020-05-27 12:40:04 -04:00
d70d06ae41
Merge pull request #2137 from dota17/MSC_VER
...
Fix issue 2112
2020-05-27 08:49:19 +02:00
3c60a66c4c
Merge pull request #2104 from dota17/issue#2086
...
Fix issue#2086: disallow json::value_t type parameter in value()
2020-05-26 13:15:06 +02:00
eb50fbf926
fix issue 2112
2020-05-26 16:43:16 +08:00
88292d9499
🚨 remove redundant assertions
2020-05-22 14:19:07 +02:00
21b1680ea1
🚚 rename binary_array() to binary()
2020-05-19 13:30:22 +02:00
952a87a4f4
🚚 move byte container outside detail namespace
2020-05-19 13:08:18 +02:00
b7ff40029a
💥 change serialization of binary values
2020-05-18 13:53:20 +02:00
904642f261
♻️ rename internal_binary_t with binary_t
2020-05-17 22:50:27 +02:00
dead99eb0e
🔨 overwork binary subtypes
2020-05-17 13:51:59 +02:00
ab6e76dd05
Merge branches 'binary_type' and 'develop' of https://github.com/nlohmann/json into binary_type
2020-05-17 12:27:58 +02:00
6154d50a9f
Merge pull request #2115 from nlohmann/issue2089
...
Do not include <ciso646> when using C++17
2020-05-17 12:17:17 +02:00
c0cf67ead3
Merge branch 'develop' of https://github.com/nlohmann/json into binary_type
2020-05-16 12:58:13 +02:00
f40a9f876a
Merge pull request #2044 from dota17/issue#1719
...
Fix issue#1719
2020-05-16 12:57:00 +02:00
bc1886fb60
♻️ refine interface of wrapped_binary_t
2020-05-15 23:21:49 +02:00
daf2d296dd
♻️ move wrapped binary type to separate file
2020-05-15 14:12:32 +02:00
bcf4f3ce9a
📝 add warning for items() on temporary objects #2040
2020-05-14 19:06:48 +02:00
44fe284f9d
Enhace to_cbor() to support +/-Infinity, NaN, and single-precision float
2020-05-14 15:10:44 +08:00
cdf5327ace
Fix issue#2086
2020-05-14 12:44:30 +08:00
a4266bbb7d
Merge branch 'develop' into issues/1457
2020-05-13 12:48:46 +02:00
b036ace235
🐛 fix bug in binary constructor
2020-05-09 14:16:49 +02:00
