Commit Graph

3973 Commits

Author SHA1 Message Date
Niels Lohmann
7d5881a9b2
Merge branch 'develop' of https://github.com/nlohmann/json into ci 2021-01-16 15:49:00 +01:00
Niels Lohmann
92fa1d9582
Merge pull request #2582 from bl-ue/patch-1
readme: fix tilde character display
2021-01-14 22:11:33 +01:00
bl-ue
c9d325b64b readme: fix tilde character display 2021-01-14 15:59:28 -05:00
Niels Lohmann
14be8c69fe
💰 add sponsor 2021-01-11 08:00:49 +01:00
Niels Lohmann
b36f40b7d5
Merge branch 'develop' of https://github.com/nlohmann/json into ci 2021-01-03 21:58:39 +01:00
Niels Lohmann
dc0a921a47
♻️ add target for CMake flags 2021-01-03 21:58:30 +01:00
Niels Lohmann
01f6b2e741
📄 update copyright year 2021-01-03 20:54:17 +01:00
Niels Lohmann
93fad232c5
♻️ add target for benchmarks 2021-01-03 20:44:22 +01:00
Niels Lohmann
1a7d208aff
Merge branch 'develop' of https://github.com/nlohmann/json into ci 2021-01-03 20:29:35 +01:00
Niels Lohmann
085d497bf7
📄 update copyright year 2021-01-03 20:28:06 +01:00
Niels Lohmann
a6b82cd50b
♻️ use iwyu properly 2021-01-01 13:08:58 +01:00
Niels Lohmann
8dc3ed11e7
🚨 fix warnings 2021-01-01 13:08:42 +01:00
Niels Lohmann
6bfcea39d0
🚨 fix warnings 2021-01-01 12:59:55 +01:00
Niels Lohmann
6085beec35
🚨 fix warnings 2021-01-01 12:51:48 +01:00
Niels Lohmann
7cb49fa3a4
🚨 fix warnings 2021-01-01 10:47:22 +01:00
Niels Lohmann
f5856be30d
Merge branch 'develop' of https://github.com/nlohmann/json into ci 2020-12-31 14:56:03 +01:00
Niels Lohmann
68c3696382
Merge pull request #2560 from nlohmann/issue2324
Add switch to skip non-reproducible tests.
2020-12-31 14:35:45 +01:00
Niels Lohmann
1587acdb1d
📝 adjust wording 2020-12-31 14:34:37 +01:00
Niels Lohmann
be32cd0196
Merge branch 'develop' of https://github.com/nlohmann/json into issue2324 2020-12-31 14:33:09 +01:00
Niels Lohmann
00e3f69a26
⬆️ update Doxyfile for doxygen 1.9.0 2020-12-30 20:31:16 +01:00
Niels Lohmann
581f92b601
Merge branch 'develop' of https://github.com/nlohmann/json into issue2324 2020-12-30 20:23:07 +01:00
Niels Lohmann
45ec48b2a1
♻️ use iwyu properly 2020-12-30 14:20:00 +01:00
Niels Lohmann
0bee42026f
♻️ rename targets 2020-12-30 13:36:19 +01:00
Niels Lohmann
77f24509d4
🚨 fix warnings 2020-12-30 13:27:29 +01:00
Niels Lohmann
35b5de2a29
Merge branch 'develop' of https://github.com/nlohmann/json into ci 2020-12-30 12:30:27 +01:00
Niels Lohmann
a8398a7151
Merge pull request #2550 from nlohmann/std_bytes
Allow parsing from std::byte containers
2020-12-30 08:33:52 +01:00
Niels Lohmann
fc7e181cbf
⚗️ fix string representation 2020-12-29 22:21:31 +01:00
Niels Lohmann
bdb2469c31
🚨 fix warnings 2020-12-29 21:36:30 +01:00
Niels Lohmann
c886646707
🚨 fix warning 2020-12-29 21:04:41 +01:00
Niels Lohmann
4402176df5
add regression test 2020-12-29 20:52:57 +01:00
Niels Lohmann
e4fc598466
⚗️ add C++20 build 2020-12-29 20:45:56 +01:00
Niels Lohmann
77be4f6aaf
⚗️ add C++20 build 2020-12-29 20:32:07 +01:00
Niels Lohmann
91d7aa571f
⚗️ add C++20 build 2020-12-29 20:30:50 +01:00
Niels Lohmann
ca51dc62f2
⚗️ try to use Clang 10 2020-12-29 20:21:43 +01:00
Niels Lohmann
433da31334
⚗️ try to use GCC 10 2020-12-29 20:16:51 +01:00
Niels Lohmann
7b98df515f
add regression test 2020-12-29 14:48:18 +01:00
Niels Lohmann
98b2152452
Merge branch 'develop' of https://github.com/nlohmann/json into std_bytes 2020-12-29 14:37:46 +01:00
Niels Lohmann
ff3863dc1d
Merge pull request #2553 from jasujm/jasujm/input_adapter_custom_container
Fix compilation of input_adapter(container) in edge cases
2020-12-29 14:37:20 +01:00
Jaakko Moisio
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
Niels Lohmann
5dd06714b1
🐛 allow parsing from std::byte containers #2546 2020-12-28 11:31:21 +01:00
Niels Lohmann
9427318440
♻️ add target for oclint 2020-12-27 15:47:30 +01:00
Niels Lohmann
4c6cda363b
🔊 add version output 2020-12-27 14:09:20 +01:00
Niels Lohmann
6f7ffa53d4
♻️ add targets for iwyu and infer 2020-12-26 22:37:29 +01:00
Niels Lohmann
36760539c4
Merge branch 'develop' of https://github.com/nlohmann/json into ci 2020-12-26 17:56:40 +01:00
Niels Lohmann
dfedefb993
🚨 fix warnings 2020-12-26 17:56:16 +01:00
Niels Lohmann
d9941bdaee
♻️ add target for self-contained binaries 2020-12-26 17:55:24 +01:00
Niels Lohmann
5276ab9c44
♻️ add target for cpplint 2020-12-26 15:09:50 +01:00
Niels Lohmann
b1afe8d55b
Merge branch 'develop' of https://github.com/nlohmann/json into ci 2020-12-26 14:59:13 +01:00
Niels Lohmann
f15d447522
🚨 fix warnings 2020-12-26 14:55:19 +01:00
Niels Lohmann
8d8c9b9659
⚗️ move CI targets to CMake 2020-12-26 14:32:01 +01:00