3950 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Niels Lohmann	980f8c6f61	🔀 merge develop branch	2020-07-25 21:45:47 +02:00
Niels Lohmann	42f8708940	Merge branch 'develop' of https://github.com/nlohmann/json into issue2286 ... Conflicts: single_include/nlohmann/json.hpp	2020-07-25 21:44:58 +02:00
Niels Lohmann	40b78d3847	Merge pull request #2308 from nlohmann/cbor_tags ... Fix bug in CBOR tag handling	2020-07-25 19:43:11 +02:00
Niels Lohmann	fad14aabe7	📝 update output of meta function	2020-07-25 14:41:06 +02:00
Niels Lohmann	6e5be17b62	📝 add more documentation	2020-07-25 14:40:50 +02:00
Niels Lohmann	62f98b7537	Merge branch 'develop' of https://github.com/nlohmann/json into docs	2020-07-25 11:20:13 +02:00
Niels Lohmann	a1dbfcd736	Merge pull request #2306 from jwittbrodt/develop ... added inline to NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE macro	2020-07-25 10:52:56 +02:00
Niels Lohmann	c00c3162b2	Merge branch 'develop' into develop	2020-07-25 10:52:42 +02:00
Niels Lohmann	448ceb2e12	Merge pull request #2303 from nlohmann/cleanup ... Cleanup	2020-07-25 05:41:51 +02:00
aodq	15ec0fe150	change c-style cast to static_cast for #2304	2020-07-24 16:21:30 -04:00
Niels Lohmann	58167173a2	📝 add more documentation	2020-07-24 15:25:53 +02:00
Niels Lohmann	d8d499ce9b	📝 add more documentation	2020-07-24 14:35:52 +02:00
Niels Lohmann	480ad529e3	🐛 fix bug in CBOR tag handling	2020-07-24 14:18:39 +02:00
Niels Lohmann	a84370c61f	📝 add more documentation	2020-07-24 14:04:58 +02:00
Niels Lohmann	33662417c1	✅ improve coverage	2020-07-24 09:32:03 +02:00
Jonas Wittbrodt	0f22ed0b5b	added inline to DEFINE_TYPE macro	2020-07-23 19:24:21 +02:00
aodq	12885446d8	fixes unused variable 'ex' for #2304	2020-07-23 13:21:38 -04:00
Niels Lohmann	3c7dc635e7	🙈 extend ignore list	2020-07-23 14:19:57 +02:00
Niels Lohmann	27232455c8	📝 update documentation	2020-07-23 14:17:02 +02:00
Niels Lohmann	59cb7674be	📝 update documentation	2020-07-23 14:15:20 +02:00
Niels Lohmann	0cd120f7e1	🚨 fix UBSAN warning	2020-07-23 14:06:09 +02:00
Niels Lohmann	bba57cc4af	🚨 fix UBSAN warning	2020-07-23 14:02:49 +02:00
Niels Lohmann	e571c67c0d	🚨 fix implicit conversion warning when opening binary file	2020-07-23 14:02:12 +02:00
Niels Lohmann	43e07bb92d	Merge pull request #2301 from nlohmann/regression2281 ... Add test with multiple translation units	2020-07-23 13:14:24 +02:00
Niels Lohmann	fb22233f34	🔊 add message if implicit conversions are switched off	2020-07-23 13:11:48 +02:00
Niels Lohmann	f9b71afebf	🚚 unify cmake build dir names	2020-07-23 13:02:53 +02:00
Niels Lohmann	8159091d8f	🔀 rename variable to avoid shadowing	2020-07-23 12:58:09 +02:00
Niels Lohmann	230dcfb7a3	🚨 add prefix to avoid shadowing	2020-07-23 12:57:52 +02:00
Niels Lohmann	b315fe484a	🔀 merge develop branch	2020-07-23 12:30:26 +02:00
Niels Lohmann	a33c3fdf25	Merge branch 'develop' of https://github.com/nlohmann/json into issue2286 ... Conflicts: single_include/nlohmann/json.hpp	2020-07-23 12:30:07 +02:00
Niels Lohmann	88122467bd	♻️ pull code into function	2020-07-23 12:16:18 +02:00
Niels Lohmann	a048b72fe1	Merge pull request #1559 from theodelrieu/feat/explicit_conversion_operator ... Feat/explicit conversion operator	2020-07-23 08:52:51 +02:00
Niels Lohmann	484029b51c	Merge pull request #2299 from nlohmann/fix_warnings ... Fix unused parameter	2020-07-22 18:43:33 +02:00
Niels Lohmann	a6d112ffbf	✅ add regression test for #2281	2020-07-22 13:39:40 +02:00
Niels Lohmann	2301bd1177	✅ add regression test for #2281	2020-07-22 13:24:07 +02:00
Niels Lohmann	c4356c68e0	✅ add regression test for #2281	2020-07-22 12:38:39 +02:00
Niels Lohmann	4d63252c6c	✅ add regression test for #2281	2020-07-22 12:23:58 +02:00
Niels Lohmann	a7c4c84d68	✅ add regression test for #2281	2020-07-22 12:03:37 +02:00
Théo DELRIEU	797329315a	add a CI job for explicit conversions on every os	2020-07-22 10:49:01 +02:00
Théo DELRIEU	74b446f5fd	add a switch to enable implicit conversions (defaults to true) ... wrap implicit conversions tests around the JSON_USE_IMPLICIT_CONVERSIONS macro	2020-07-22 10:49:01 +02:00
Niels Lohmann	2cd10a7405	Merge pull request #2300 from nlohmann/gihub_actions ... Merge Gitlab actions	2020-07-22 09:45:55 +02:00
Niels Lohmann	6bd38a2cb9	👷 merge Gitlab actions	2020-07-22 09:02:55 +02:00
Niels Lohmann	8b14c9b305	🚨 fix warnings	2020-07-21 23:00:56 +02:00
Niels Lohmann	3bb43ecd51	🔀 merge develop branch	2020-07-21 22:02:14 +02:00
Niels Lohmann	3249a4d821	Merge branch 'develop' of https://github.com/nlohmann/json into issue2286 ... Conflicts: single_include/nlohmann/json.hpp	2020-07-21 22:01:32 +02:00
Niels Lohmann	96e9f66025	🔇 remove debug output	2020-07-21 22:01:15 +02:00
Niels Lohmann	8046754c15	🔊 add debug output to tests	2020-07-21 12:44:38 +02:00
Niels Lohmann	b1903fff1f	💚 fix build	2020-07-21 09:09:30 +02:00
Niels Lohmann	1339d6b683	🐛 add missing EOF check	2020-07-20 22:40:28 +02:00
Niels Lohmann	a9117828e1	🚨 fix warnings	2020-07-20 22:38:00 +02:00