Commit Graph

514 Commits

Author SHA1 Message Date
Niels Lohmann
2b0d696f4a
🔀 merge develop 2021-02-10 07:28:18 +01:00
Niels Lohmann
56a6dec0de
🔀 merge develop branch 2021-02-07 17:46:11 +01:00
Niels Lohmann
4917e7c259
Merge branch 'develop' of https://github.com/nlohmann/json into diagnostics
 Conflicts:
	include/nlohmann/detail/input/parser.hpp
	single_include/nlohmann/json.hpp
2021-02-07 17:45:09 +01:00
Niels Lohmann
9ced2bf5c3
👷 add CI step for coverage 2021-01-31 15:31:15 +01:00
Niels Lohmann
6413f31d8e
👷 add CI step for coverage 2021-01-31 12:41:16 +01:00
Niels Lohmann
6d4eed5aeb
🚨 fix warning 2021-01-30 12:51:54 +01:00
Niels Lohmann
b66ebcc950
🚨 fix warnings 2021-01-30 12:50:36 +01:00
Niels Lohmann
2465302310
🚨 fix warnings 2021-01-29 23:00:30 +01:00
Niels Lohmann
0b7af878e4
🚨 fix warnings 2021-01-29 22:57:52 +01:00
Niels Lohmann
37b8071123
🚨 fix warnings 2021-01-29 20:15:41 +01:00
Niels Lohmann
52aa607c87
🚨 fix warnings 2021-01-29 15:15:41 +01:00
Niels Lohmann
baaa706262
🚨 add missing header 2021-01-29 14:47:54 +01:00
Niels Lohmann
1101f0e359
🚨 fix warnings 2021-01-29 14:42:45 +01:00
Niels Lohmann
3393ce0478
🚨 fix warnings 2021-01-28 21:53:18 +01:00
Niels Lohmann
c3edf49451
🚨 fix warnings 2021-01-28 21:25:46 +01:00
Niels Lohmann
de9ae4e759
🚨 fix warnings 2021-01-28 20:39:50 +01:00
Niels Lohmann
b5c5eaad5a
🚨 fix warnings 2021-01-28 20:00:59 +01:00
Niels Lohmann
e2868eed33
🚨 fix warnings 2021-01-28 19:42:53 +01:00
Niels Lohmann
bfd4c7c739
🚨 fix warnings 2021-01-28 17:10:52 +01:00
Niels Lohmann
0dcb01bc47
🚨 fix warnings 2021-01-28 16:38:11 +01:00
Niels Lohmann
bdcabc05d1
🚨 fix warnings 2021-01-28 16:02:48 +01:00
Niels Lohmann
09bf771fd4
🚨 fix warnings 2021-01-28 15:44:04 +01:00
Niels Lohmann
4ade7210ac
Merge branch 'develop' of https://github.com/nlohmann/json into ci 2021-01-28 14:48:51 +01:00
Niels Lohmann
0a27d1cf59
👷 add CI steps for cppcheck and cpplint 2021-01-27 21:18:42 +01:00
Niels Lohmann
ffdeb77468
🚨 fix warnings #2615 2021-01-27 12:54:46 +01:00
Niels Lohmann
524eea5887
👌 remove unused template parameter 2021-01-26 17:49:15 +01:00
Niels Lohmann
74cc0ab470
♻️ remove diagnostics_t class 2021-01-25 13:47:50 +01:00
Niels Lohmann
c190a72f3d
👌 apply suggestion
Co-authored-by: Alexander Karzhenkov <karzhenkov@mail.ru>
2021-01-24 17:45:08 +01:00
Niels Lohmann
380a613f2b
🐛 fix bug in diagnostics_t 2021-01-23 20:58:59 +01:00
Niels Lohmann
9dd1d50bf3
🚨 fix comment 2021-01-23 20:38:08 +01:00
Niels Lohmann
96a1334072
🚨 fix includes 2021-01-23 17:07:09 +01:00
Niels Lohmann
d6ff059a90
👌 addressed review comments 2021-01-20 15:05:07 +01:00
Niels Lohmann
33379684b4
improve coverage 2021-01-17 22:52:40 +01:00
Niels Lohmann
e9d641130d
🐛 proper JSON Pointer escape in diagnostic messages 2021-01-16 15:33:05 +01:00
Niels Lohmann
0d1fb383b7
👌 address comment 2021-01-14 22:05:08 +01:00
Niels Lohmann
b9d3aa4067
♻️ split set_parent function 2021-01-14 21:55:49 +01:00
Niels Lohmann
ff57bdcc8b
🐛 fix invariants 2021-01-10 22:40:50 +01:00
Niels Lohmann
1d6ba22f15
♻️ simplify code 2021-01-10 14:10:59 +01:00
Niels Lohmann
a83404525e
🚨 fix warnings 2021-01-10 13:39:36 +01:00
Niels Lohmann
e160749003
♻️ move diagnostic code in header 2021-01-09 19:21:18 +01:00
Niels Lohmann
ec0b1798bc
🚧 implement more parent relations 2021-01-02 21:36:11 +01:00
Niels Lohmann
7323a8eb4e
🚧 add tests 2021-01-02 16:13:04 +01:00
Niels Lohmann
7b047861b0
🚧 add diagnostics to exceptions 2021-01-02 13:44:41 +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
bdb2469c31
🚨 fix warnings 2020-12-29 21:36:30 +01:00
Niels Lohmann
433da31334
⚗️ try to use GCC 10 2020-12-29 20:16:51 +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
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