433da31334
⚗️ try to use GCC 10
2020-12-29 20:16:51 +01:00
98b2152452
Merge branch 'develop' of https://github.com/nlohmann/json into std_bytes
2020-12-29 14:37:46 +01:00
467f622c65
Fix compilation of input_adapter(container) in edge cases
...
This fixes a compilation issue with the library if trying to use containers that
don't have non-member `begin()` and `end()` functions via ADL.
This patch extends the `using std::begin` and `using std::end` declarations to
also cover the return type deduction of the input_adapter() template
specialization for containers. The previous implementation only enabled the
detection of `std::begin()` and `std::end()` in the function body, making the
specialization unusable for container types that only have member `begin()` and
`end()` functions.
It is not typical to have `using` declarations in the namespace scope in a
header file. But a C++11 implementation can't rely on fully automatic return
type deduction, and needs to rely on ADL enabled helper templates. To prevent
the using declarations leaking, they are enclosed in another nested namespace.
2020-12-28 22:21:02 +01:00
5dd06714b1
🐛 allow parsing from std::byte containers #2546
2020-12-28 11:31:21 +01:00
dfedefb993
🚨 fix warnings
2020-12-26 17:56:16 +01:00
f15d447522
🚨 fix warnings
2020-12-26 14:55:19 +01:00
cd7acc1dc5
Include <string_view> in "nlohmann/json.hpp" when C++17 is used
2020-12-20 19:40:36 +05:00
af8c6e7aa9
Merge pull request #2533 from nlohmann/c++_future
...
Do not unconditionally redefine C++14 constructs
2020-12-16 20:54:09 +01:00
5c1a5bc9c1
Merge pull request #2534 from nlohmann/clarify_license
...
Clarify license of is_complete_type implementation
2020-12-16 20:53:38 +01:00
5cc5285fe8
🚨 fix shadowing warning
2020-12-15 22:15:36 +01:00
94d177e09a
📄 clarify license
2020-12-14 14:58:59 +01:00
467986fe98
♻️ do not unconditionally redefine C++14 constructs
2020-12-14 14:31:27 +01:00
85ffc85a29
🎨 amalgamate code
2020-12-14 10:38:49 +01:00
3ad6992f50
Merge pull request #2405 from karzhenkov/fix-json_ref-move
...
Fix move constructor of json_ref
2020-12-11 13:36:33 +01:00
e3643aadf7
Merge pull request #2447 from jbzdarkid/develop
...
Add asserts to suppress C28020
2020-12-11 13:27:52 +01:00
972c15f26e
ordered_map::insert(InputIt first, InputIt last) is added
2020-12-07 20:15:41 +03:00
9f45d314d5
Apply suggestions from code review
...
Co-authored-by: Niels Lohmann <niels.lohmann@gmail.com >
2020-11-24 11:02:58 -08:00
64ff1cf90d
Add asserts to suppress C28020
2020-10-26 13:57:38 -07:00
42a9dc0bc3
Improve json_ref implementation
2020-09-27 10:45:21 +05:00
14f8be11ce
Merge branch 'develop' of https://github.com/nlohmann/json into hedley14
2020-08-24 16:12:11 +02:00
9d726c25d5
♻️ remove "#define private public"
2020-08-12 13:30:06 +02:00
411fc3249b
⬆️ Hedley 14 (dev branch)
2020-08-12 13:00:57 +02:00
b888afe5f4
Merge pull request #2349 from nlohmann/issue2348
...
Remove -Wimplicit-fallthrough warning
2020-08-11 09:05:02 +02:00
dd8cb2acc1
🚨 remove -Wimplicit-fallthrough warning #2348
2020-08-10 20:48:39 +02:00
4080d0b1a4
✅ add test to compile without exceptions
2020-08-10 09:48:11 +02:00
824d55bf26
📝 fix documentation #1668
2020-08-10 09:24:11 +02:00
b3e5cb7f20
🔖 set version to 3.9.1
2020-08-06 13:45:29 +02:00
f4155e4727
Merge pull request #2333 from nlohmann/fallthrough
...
Fix fallthrough warning
2020-08-01 15:32:21 +02:00
0326e4e2a6
🚨 fix fallthrough warning
2020-07-31 19:24:03 +02:00
3888b1642a
🐛 fix lexer to properly cope with repeated comments #2330
2020-07-31 18:59:22 +02:00
f13af83a94
🐛 add more functions from std::map to nlohmann::ordered_map
2020-07-28 21:47:06 +02:00
e590604822
🐛 fix a bug due to missing overloads in ordered_map container
2020-07-28 14:20:31 +02:00
e110667d21
🔖 set version to 3.9.0
2020-07-27 15:48:09 +02:00
67ed63b196
Merge pull request #2312 from nlohmann/docs
...
Update documentation
2020-07-26 10:06:01 +02:00
808aca41aa
Merge pull request #2305 from AODQ/develop
...
fixes unused variable 'ex' for #2304
2020-07-25 21:51:54 +02:00
1816aae862
Merge branch 'develop' of https://github.com/nlohmann/json into docs
2020-07-25 21:48:51 +02:00
980f8c6f61
🔀 merge develop branch
2020-07-25 21:45:47 +02:00
40b78d3847
Merge pull request #2308 from nlohmann/cbor_tags
...
Fix bug in CBOR tag handling
2020-07-25 19:43:11 +02:00
fad14aabe7
📝 update output of meta function
2020-07-25 14:41:06 +02:00
62f98b7537
Merge branch 'develop' of https://github.com/nlohmann/json into docs
2020-07-25 11:20:13 +02:00
c00c3162b2
Merge branch 'develop' into develop
2020-07-25 10:52:42 +02:00
15ec0fe150
change c-style cast to static_cast for #2304
2020-07-24 16:21:30 -04:00
d8d499ce9b
📝 add more documentation
2020-07-24 14:35:52 +02:00
480ad529e3
🐛 fix bug in CBOR tag handling
2020-07-24 14:18:39 +02:00
0f22ed0b5b
added inline to DEFINE_TYPE macro
2020-07-23 19:24:21 +02:00
12885446d8
fixes unused variable 'ex' for #2304
2020-07-23 13:21:38 -04:00
230dcfb7a3
🚨 add prefix to avoid shadowing
2020-07-23 12:57:52 +02:00
a048b72fe1
Merge pull request #1559 from theodelrieu/feat/explicit_conversion_operator
...
Feat/explicit conversion operator
2020-07-23 08:52:51 +02:00
74b446f5fd
add a switch to enable implicit conversions (defaults to true)
...
wrap implicit conversions tests around the JSON_USE_IMPLICIT_CONVERSIONS
macro
2020-07-22 10:49:01 +02:00
8b14c9b305
🚨 fix warnings
2020-07-21 23:00:56 +02:00
