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
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
gatopeich
15337b2cc3
Ignore allocator hardcoded to match std::map
2020-06-22 00:03:48 +01:00
Niels Lohmann
4fd0d02b6f
🚧 toward an ordered_json type
2020-06-19 15:27:05 +02:00
Niels Lohmann
5f862710fe
🔖 set version to 3.8.0
2020-06-14 17:16:45 +02:00
Niels Lohmann
8c1d26e186
📝 add documentation and example for accept function
2020-06-07 20:59:43 +02:00
Niels Lohmann
bf2e714e96
🚨 fix warnings
2020-06-06 14:30:17 +02:00
Francois Chabot
b715a70673
changed macro order to satisfy clang
2020-05-28 12:26:29 -04:00
Francois Chabot
ce3143a038
use correct deprecation macro
2020-05-28 12:16:10 -04:00
Francois Chabot
d575534471
brought back the from_*(ptr, len) syntax with a deprecation warning
2020-05-28 12:13:43 -04:00
Francois Chabot
a4f1cf4d00
better parse documentation
2020-05-28 02:50:58 -04:00
Francois Chabot
76b49f9ee6
misc formatting fixes
2020-05-28 02:29:53 -04:00
Francois Chabot
f1969e60a3
reamalgamate
2020-05-27 12:56:26 -04:00
Francois Chabot
5684d9a498
unified input API
2020-05-27 12:40:04 -04:00
Niels Lohmann
d70d06ae41
Merge pull request #2137 from dota17/MSC_VER
...
Fix issue 2112
2020-05-27 08:49:19 +02:00
Niels Lohmann
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
chenguoping
eb50fbf926
fix issue 2112
2020-05-26 16:43:16 +08:00
Niels Lohmann
88292d9499
🚨 remove redundant assertions
2020-05-22 14:19:07 +02:00
Niels Lohmann
21b1680ea1
🚚 rename binary_array() to binary()
2020-05-19 13:30:22 +02:00
Niels Lohmann
952a87a4f4
🚚 move byte container outside detail namespace
2020-05-19 13:08:18 +02:00
Niels Lohmann
b7ff40029a
💥 change serialization of binary values
2020-05-18 13:53:20 +02:00
Niels Lohmann
904642f261
♻️ rename internal_binary_t with binary_t
2020-05-17 22:50:27 +02:00
Niels Lohmann
dead99eb0e
🔨 overwork binary subtypes
2020-05-17 13:51:59 +02:00
Niels Lohmann
ab6e76dd05
Merge branches 'binary_type' and 'develop' of https://github.com/nlohmann/json into binary_type
2020-05-17 12:27:58 +02:00
Niels Lohmann
6154d50a9f
Merge pull request #2115 from nlohmann/issue2089
...
Do not include <ciso646> when using C++17
2020-05-17 12:17:17 +02:00
Niels Lohmann
c0cf67ead3
Merge branch 'develop' of https://github.com/nlohmann/json into binary_type
2020-05-16 12:58:13 +02:00
Niels Lohmann
f40a9f876a
Merge pull request #2044 from dota17/issue#1719
...
Fix issue#1719
2020-05-16 12:57:00 +02:00
Niels Lohmann
bc1886fb60
♻️ refine interface of wrapped_binary_t
2020-05-15 23:21:49 +02:00
Niels Lohmann
daf2d296dd
♻️ move wrapped binary type to separate file
2020-05-15 14:12:32 +02:00
Niels Lohmann
bcf4f3ce9a
📝 add warning for items() on temporary objects #2040
2020-05-14 19:06:48 +02:00
chenguoping
44fe284f9d
Enhace to_cbor() to support +/-Infinity, NaN, and single-precision float
2020-05-14 15:10:44 +08:00
chenguoping
cdf5327ace
Fix issue#2086
2020-05-14 12:44:30 +08:00
Niels Lohmann
a4266bbb7d
Merge branch 'develop' into issues/1457
2020-05-13 12:48:46 +02:00
Niels Lohmann
b036ace235
🐛 fix bug in binary constructor
2020-05-09 14:16:49 +02:00
Niels Lohmann
f0c6ab4d3b
🐛 fix bug in SAX callback parser
2020-05-08 14:21:11 +02:00
Niels Lohmann
9adb1c0235
🏁 do not include <ciso646> unless old MSVC is used #2089
2020-05-07 09:43:41 +02:00
Niels Lohmann
421a084396
✨ add convenience function to create binary value with given subtype
2020-05-06 21:23:45 +02:00
Niels Lohmann
6dee8866a8
🐛 fix binary comparison
2020-05-05 12:40:04 +02:00
Niels Lohmann
48aa441661
✨ add swap function for binary type
2020-05-04 22:07:36 +02:00
Niels Lohmann
db013c9428
Merge pull request #2071 from nlohmann/issue2067
...
Properly pass serialize_binary to dump function
2020-04-29 19:39:58 +02:00
Niels Lohmann
2e5727d778
🐛 properly pass serialize_binary to dump function #2067
2020-04-27 15:10:23 +02:00
Niels Lohmann
9e0180b698
🐛 fix returning reference to local temporary object #2064
2020-04-27 14:43:49 +02:00
Niels Lohmann
a29e3b1318
Merge pull request #2054 from nlohmann/feature/issue1983
...
Fix bug in diff function
2020-04-20 19:44:35 +02:00
Niels Lohmann
e8356928bd
🚨 fix compiler warnings #2052
2020-04-19 13:25:02 +02:00
Niels Lohmann
f2b43a36b2
Merge pull request #1662 from OmnipotentEntity/develop
...
Add binary type support to all binary file formats, as well as an internally represented binary type
2020-04-16 11:14:32 +02:00
