4277 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
abbaswasim	ddbdb65834	Fix amount of entries in the json object ... After the initial j.push_back() calls there is another j.emplace_back() call that makes the size == 4 not 3.	2021-03-02 01:42:33 +00:00
Niels Lohmann	176d8e261a	Merge pull request #2562 from nlohmann/diagnostics ... Better diagnostics	2021-02-10 07:20:54 +01:00
Niels Lohmann	bb90e34d22	⬆️ Hedley v15	2021-02-07 17:47:08 +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	e754ef7087	Merge pull request #2625 from wawiesel/patch-1 ... Fix missing 1.78 in example in README.md	2021-02-07 14:26:38 +01:00
William A. Wieselquist	567e2e3412	Fix missing 1.78 in example in README.md	2021-02-06 14:48:12 -05:00
Niels Lohmann	6d4eed5aeb	🚨 fix warning	2021-01-30 12:51:54 +01:00
Niels Lohmann	27b44cb17b	Merge branch 'issue2615' of https://github.com/nlohmann/json into develop	2021-01-28 14:47:28 +01:00
Niels Lohmann	9f6b78ee5a	📝 add documentation	2021-01-27 14:34:10 +01:00
Niels Lohmann	5b0c804630	🐛 properly assign two labels to one test case #2596	2021-01-27 14:22:58 +01:00
Niels Lohmann	ffdeb77468	🚨 fix warnings #2615	2021-01-27 12:54:46 +01:00
Niels Lohmann	3b63a47270	🚨 suppress warning	2021-01-26 20:53:02 +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
Anthony VH	130382f2a9	Remove comment about GCC commit which didn't really relate to the code.	2021-01-24 20:02:24 +01:00
Niels Lohmann	e8dba10f53	✅ add test	2021-01-24 17:45:48 +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	b83fe5dbf2	Merge pull request #2607 from nlohmann/issue1952 ... Add GDB pretty printer	2021-01-24 13:58:20 +01:00
Niels Lohmann	380a613f2b	🐛 fix bug in diagnostics_t	2021-01-23 20:58:59 +01:00
Anthony VH	848927ae90	Updated comments as requested.	2021-01-23 18:24:47 +01:00
Niels Lohmann	312a998873	🚸 add GDB pretty printer	2021-01-23 13:26:44 +01:00
Niels Lohmann	7b7da08fb6	📝 update documentation	2021-01-23 10:04:19 +01:00
Niels Lohmann	42218cac1b	⚗️ try 9 bytes	2021-01-21 22:01:09 +01:00
Niels Lohmann	d00ad33e46	📝 update documentation	2021-01-21 21:47:19 +01:00
Niels Lohmann	51ac6000d2	✅ improve coverage	2021-01-21 13:36:23 +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	5ec0980514	💚 fix build	2021-01-17 16:51:14 +01:00
Niels Lohmann	65107f7c9d	💚 fix build	2021-01-17 13:32:36 +01:00
Niels Lohmann	e23af7434d	🚨 fix warnings	2021-01-17 13:32:26 +01:00
Niels Lohmann	aeecc09ba1	✅ add tests for diagnostics	2021-01-16 15:33:19 +01:00
Niels Lohmann	e9d641130d	🐛 proper JSON Pointer escape in diagnostic messages	2021-01-16 15:33:05 +01:00
Niels Lohmann	29f7abf57d	🚨 fix format-truncation warning #2572	2021-01-15 17:01:47 +01:00
Niels Lohmann	7633a21e6c	💚 fix build	2021-01-15 16:58:05 +01:00
Niels Lohmann	b0d8628c49	👌 address comments	2021-01-15 16:54:00 +01:00
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