4141 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Niels Lohmann	1a467a8c4e	Merge branch 'develop' of https://github.com/nlohmann/json into diagnostics	2021-01-15 16:48:50 +01:00
Niels Lohmann	f8037660d0	♻️ add iterator set_parent function	2021-01-14 22:43:52 +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
Niels Lohmann	0d1fb383b7	👌 address comment	2021-01-14 22:05:08 +01:00
bl-ue	c9d325b64b	readme: fix tilde character display	2021-01-14 15:59:28 -05:00
Niels Lohmann	a77621687a	📝 fix comment	2021-01-14 21:56:19 +01:00
Niels Lohmann	b9d3aa4067	♻️ split set_parent function	2021-01-14 21:55:49 +01:00
Niels Lohmann	10751d1189	Merge branch 'develop' of https://github.com/nlohmann/json into diagnostics	2021-01-14 21:38:48 +01:00
Anthony VH	6eb37e9b78	Only add conditional constexpr to get() for >= C++14 to work around errors on older compilers.	2021-01-14 12:41:30 +01:00
Anthony VH	d7c0f157c5	Merged from_json for pair and tuple to try to fix C2995 error in old MSVC versions.	2021-01-13 20:47:03 +01:00
Anthony VH	fbf6df63d9	Enable member function calls in trailing return decltype expressions for older compilers.	2021-01-13 00:12:51 +01:00
Anthony VH	fc8c584288	Regenerated single include.	2021-01-12 18:29:05 +01:00
Anthony VH	6ef1614fa9	Refactor json::get() to use priority_tag.	2021-01-12 18:28:47 +01:00
Anthony VH	6278f31d23	Simplify from_json overloads.	2021-01-12 18:28:29 +01:00
Anthony VH	6ebf274ca0	Add internal version of is_default_constructible to work around LWG 2367.	2021-01-12 18:28:00 +01:00
Anthony VH	672e8bfc1d	Fixed std::pair trying to deserialize via array functions.	2021-01-11 18:16:15 +01:00
Niels Lohmann	14be8c69fe	💰 add sponsor	2021-01-11 08:00:49 +01:00
Niels Lohmann	ff57bdcc8b	🐛 fix invariants	2021-01-10 22:40:50 +01:00
Anthony VH	23f462b598	Reduced code duplication, renamed tag to identity_tag.	2021-01-10 19:23:32 +01:00
Niels Lohmann	9d0150c234	♻️ simplify code	2021-01-10 15:04:14 +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
Anthony VH	1b113f73c2	Added extra tests to improve coverage.	2021-01-09 17:54:56 +01:00
Anthony VH	c0a8b45bbb	Renamed template parameter and added some comments.	2021-01-09 17:45:56 +01:00
Anthony VH	1e825e4f92	Add support for deserialization of STL containers of non-default constructable types (fixes #2574).	2021-01-09 00:08:27 +01:00
Niels Lohmann	43cd5c8a4d	👌 fix constructor	2021-01-08 18:00:23 +01:00
Niels Lohmann	d4a91b7445	👌 clean operator[]	2021-01-08 11:29:28 +01:00
Niels Lohmann	e4af1ddb18	👌 fix operator[]	2021-01-08 11:21:41 +01:00
Niels Lohmann	04a0a07159	👌 fix move constructor and move assignment	2021-01-08 11:21:03 +01:00
Niels Lohmann	0617bd248d	👌 fix operator[]	2021-01-08 11:10:24 +01:00
Niels Lohmann	ddc3bb1992	👌 remove unnecessary assignment from destructor	2021-01-08 11:09:58 +01:00
Niels Lohmann	7cdf34b21e	Merge branch 'develop' of https://github.com/nlohmann/json into diagnostics	2021-01-08 10:20:34 +01:00
Niels Lohmann	01f6b2e741	📄 update copyright year	2021-01-03 20:54:17 +01:00
Niels Lohmann	085d497bf7	📄 update copyright year	2021-01-03 20:28:06 +01:00
Niels Lohmann	294fa343d5	🐛 fix bug in move constructor	2021-01-03 20:06:32 +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	09cd4ed125	🚧 fix preprocessor check	2021-01-02 14:10:40 +01:00
Niels Lohmann	c6e7fa21ed	🚧 fix preprocessor check	2021-01-02 13:58:05 +01:00
Niels Lohmann	ecaab32ef0	🚧 add switch for diagnostics	2021-01-02 13:45:00 +01:00
Niels Lohmann	7b047861b0	🚧 add diagnostics to exceptions	2021-01-02 13:44:41 +01:00
Niels Lohmann	a4d491e22d	🚧 better diagnostics	2021-01-01 17:23:10 +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	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