4165 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Louis Dionne	b0e5965d71	Properly constrain the basic_json conversion operator ... Fixes #2491	2021-07-19 11:16:27 -04:00
Niels Lohmann	926fab47d0	📝 fix GIF examples #2457	2021-07-17 14:43:01 +02:00
Niels Lohmann	a0863b8c20	📝 add support section	2021-07-17 13:44:54 +02:00
Niels Lohmann	517aeec299	Merge remote-tracking branch 'origin/develop' into develop	2021-07-17 12:39:45 +02:00
Niels Lohmann	8f0a880c89	Merge pull request #2879 from nlohmann/issue2598 ... Avoid string in case of empty CBOR objects	2021-07-17 12:38:33 +02:00
Niels Lohmann	3db8903f29	📝 restructure README	2021-07-16 15:00:11 +02:00
Niels Lohmann	fb1ee4f94b	📝 update documentation	2021-07-16 14:41:14 +02:00
Niels Lohmann	835749efcc	✅ add test for JSON_SystemInclude flag	2021-07-16 12:34:15 +02:00
Niels Lohmann	fb31616a61	Merge remote-tracking branch 'origin/develop' into develop	2021-07-16 12:27:53 +02:00
Niels Lohmann	b2d21067d1	Merge pull request #2762 from jpl-mac/no.tidy.warnings.dev ... Add a cmake option to use SYSTEM in target_include_directories	2021-07-16 12:06:26 +02:00
Niels Lohmann	c65369acbe	👷 fix Codacity badge	2021-07-16 11:44:07 +02:00
Niels Lohmann	f907f9502d	Merge pull request #2875 from nlohmann/issue2592 ... Suppress C4127 warning in unit-json_pointer.cpp	2021-07-16 10:11:29 +02:00
Niels Lohmann	b7cc47089f	⚡ avoid string in case of empty objects	2021-07-16 09:27:18 +02:00
Niels Lohmann	c89e23c69b	Merge pull request #2874 from nlohmann/issue2572 ... Fix truncation warning	2021-07-16 07:54:48 +02:00
Niels Lohmann	f883ddd1c2	Merge pull request #2872 from nlohmann/issue2865 ... Fix memory leak in to_json	2021-07-16 06:52:28 +02:00
Niels Lohmann	92ec35735c	Merge branch 'develop' of https://github.com/nlohmann/json into issue2592	2021-07-15 22:28:03 +02:00
Niels Lohmann	953dcfb611	🚨 fix warning #2572	2021-07-15 22:00:16 +02:00
Niels Lohmann	996ac1c017	Merge branch 'develop' of https://github.com/nlohmann/json into issue2572 ... Conflicts: include/nlohmann/detail/output/serializer.hpp single_include/nlohmann/json.hpp	2021-07-15 21:57:52 +02:00
Niels Lohmann	3e4723a49f	🔨 remove noexcept annotation	2021-07-15 21:49:09 +02:00
Niels Lohmann	ecaac22656	💡 add comment to describe j.m_value.destroy(j.m_type) calls	2021-07-15 20:34:50 +02:00
Niels Lohmann	f6863e062c	🐛 fix leak for all types	2021-07-15 20:32:37 +02:00
Niels Lohmann	0011cd1b72	🐛 fix leak for strings	2021-07-15 13:12:21 +02:00
Niels Lohmann	0f8666ecdc	🐛 fix leak for strings	2021-07-15 13:03:20 +02:00
Niels Lohmann	c1298e69a6	🐛 fix leak for strings	2021-07-15 12:52:17 +02:00
Niels Lohmann	6cbdc83994	🐛 fix leak for strings	2021-07-15 12:47:15 +02:00
Niels Lohmann	149ded856f	♻️ simplify destroy() function for primitive types	2021-07-15 12:46:48 +02:00
Niels Lohmann	db98073930	✅ add regression test	2021-07-15 09:02:24 +02:00
Niels Lohmann	c9c5c016a2	Merge pull request #2866 from nlohmann/issue2838	2021-07-14 12:04:37 +02:00
Niels Lohmann	4e92a61784	Merge pull request #2795 from turintech/develop ... Specified git branch for google benchmark fetch in benchmark test	2021-07-13 16:58:25 +02:00
Niels Lohmann	a711e1f5a7	🚨 fix warnings	2021-07-13 15:37:57 +02:00
Niels Lohmann	3bb9467073	♻️ move capacity check to set_parent function	2021-07-13 15:27:27 +02:00
Niels Lohmann	bc7e8faa4f	🔥 remove duplicated line	2021-07-12 19:21:07 +02:00
Niels Lohmann	b0730f29cf	🐛 fix logics	2021-07-12 15:24:06 +02:00
Niels Lohmann	d40e98ecef	🐛 fix assertion failure #2838	2021-07-12 13:38:28 +02:00
Niels Lohmann	9426074ce8	Merge pull request #2861 from nlohmann/documentation ... Update documentation	2021-07-11 14:15:41 +02:00
Niels Lohmann	249688037f	⚗️ fix coverage	2021-07-11 09:33:43 +02:00
Niels Lohmann	7442c24662	🚨 suppress missingReturn warnings	2021-07-10 13:44:13 +02:00
Niels Lohmann	a82f66beed	📝 document JSON_NO_IO macro #2842	2021-07-10 12:51:18 +02:00
Niels Lohmann	5c8d0af5ce	📝 add comment for handling of negative zeros #2854	2021-07-10 12:50:59 +02:00
Niels Lohmann	098bbab029	Merge remote-tracking branch 'origin/develop' into develop	2021-07-06 08:46:51 +02:00
Niels Lohmann	71fd9bd954	📝 fix documentation (#2845)	2021-07-06 08:46:17 +02:00
Rafail Giavrimis	b7e493e98a	Specified git branch for google benchmark fetch ... The default branch was renamed from "master" to "main", which breaks the cloning process.	2021-06-27 17:52:28 +03:00
Niels Lohmann	6471a63115	Merge pull request #2729 from theShmoo/without-io ... Possibility to use without the dependency to file io and streams to use in intel sgx enclaves	2021-06-26 12:50:06 +02:00
Niels Lohmann	624f59eacb	Merge pull request #2826 from justanotheranonymoususer/patch-1 ... Consistency with `using` in README.md	2021-06-21 14:48:39 +02:00
justanotheranonymoususer	e970f31066	Update arbitrary_types.md	2021-06-18 12:44:27 +03:00
justanotheranonymoususer	c3d7fcb76c	Update README.md	2021-06-18 11:04:53 +03:00
justanotheranonymoususer	9710108d6a	Consistency with using in README.md	2021-06-17 21:39:29 +03:00
David Pfahler	572343be63	Merge branch 'nlohmann:develop' into without-io	2021-06-15 12:24:19 +02:00
Niels Lohmann	18a5f4c7ca	Merge pull request #2790 from nlohmann/macos_standards ... Add C++ standards to macOS matrix	2021-06-14 20:23:21 +02:00
David Pfahler	aa849a2275	Merge branch 'nlohmann:develop' into without-io	2021-06-14 08:22:49 +02:00