4206 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Niels Lohmann	e5ef44c4dd	Merge pull request #2927 from fhuberts/fix-switch-enum	2021-08-13 19:32:39 +02:00
Ferry Huberts	cdbc50b9a8	Again forgot to amalgate (sigh) ... Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>	2021-08-13 15:33:05 +02:00
Ferry Huberts	364a21be6b	Add coverage exclusion comments, as requested ... Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>	2021-08-13 15:30:55 +02:00
Ferry Huberts	95b73bcd01	Forgot to amalgate ... Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>	2021-08-13 14:22:18 +02:00
Ferry Huberts	e7a69b8d31	Adjust more files after actually building like the CI ... Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>	2021-08-13 14:00:00 +02:00
Ferry Huberts	832cee5b77	Adjust warnings flags, as requested ... Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>	2021-08-12 19:49:54 +02:00
Ferry Huberts	44d60f8d14	All: fix warnings when compiling with -Wswitch-enum ... Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>	2021-08-12 16:33:50 +02:00
Niels Lohmann	910fabf8f0	Merge pull request #2925 from nlohmann/issue2924 ... Guard GCC pragmas	2021-08-12 07:58:50 +02:00
Niels Lohmann	e20f3f95eb	🚨 guard GCC pragmas #2924	2021-08-11 23:55:46 +02:00
Niels Lohmann	57d31d1b83	Merge pull request #2898 from nlohmann/issue2824 ... Add regression test	2021-08-11 13:02:49 +02:00
Niels Lohmann	8ae31a56a5	Merge branch 'develop' of https://github.com/nlohmann/json into issue2824	2021-08-11 08:06:32 +02:00
Niels Lohmann	68d8661f1b	📝 update documentation	2021-08-11 08:06:25 +02:00
Niels Lohmann	b792bf5660	⚗️ try minimal example	2021-08-10 10:29:13 +02:00
Niels Lohmann	26569f8ecc	⚗️ try minimal example	2021-08-10 10:09:31 +02:00
Niels Lohmann	edc203a837	⚗️ try minimal example	2021-08-10 08:35:14 +02:00
Niels Lohmann	0d530c9de8	⚗️ try minimal example	2021-08-10 08:22:21 +02:00
Niels Lohmann	36394cc262	⚗️ try minimal example	2021-08-09 21:58:05 +02:00
Niels Lohmann	83c005f881	⚗️ try minimal example	2021-08-09 21:43:03 +02:00
Niels Lohmann	359f6723fc	Merge pull request #2911 from Finkman/develop ... Supress -Wfloat-equal on intended float comparisions	2021-08-06 12:58:34 +02:00
Sven Fink	3f5545f99b	Remove -Wfloat-equal suppressions on tests	2021-08-04 09:14:45 +02:00
Sven Fink	353d59717e	Add more suppressions on float comparisons	2021-08-04 08:34:53 +02:00
Sven Fink	095aae19fe	Supress -Wfloat-equal on intended float comparisions	2021-08-03 08:58:38 +02:00
Niels Lohmann	eb488bb4d9	📝 add note for wstring handling	2021-08-01 20:54:02 +02:00
Niels Lohmann	c3df4ffd5a	🚨 fix warning	2021-08-01 14:08:14 +02:00
Niels Lohmann	5a1bc76f34	⚗️ switch off exceptions	2021-08-01 13:34:55 +02:00
Niels Lohmann	e7260f07f5	Merge branch 'develop' of https://github.com/nlohmann/json into issue2824	2021-08-01 13:07:43 +02:00
Niels Lohmann	a54403290e	📄 add CITATION file	2021-08-01 12:42:59 +02:00
Niels Lohmann	9ed027ac10	Merge pull request #2902 from nlohmann/issue2893 ... Fix useless-cast warnings	2021-07-31 20:42:55 +02:00
Niels Lohmann	8676f6745e	✅ add regression test #2824	2021-07-30 21:18:25 +02:00
Niels Lohmann	f4716a0d42	🚨 fix useless-cast warnings	2021-07-30 21:12:55 +02:00
Niels Lohmann	9a459e1bd5	🚨 fix useless-cast warnings	2021-07-30 15:20:22 +02:00
Niels Lohmann	c7822840eb	✅ add regression test #2824	2021-07-30 15:00:54 +02:00
Niels Lohmann	7feb2c20cf	🚨 fix useless-cast warnings	2021-07-30 14:48:25 +02:00
Niels Lohmann	2c030bac2c	✅ add regression test #2824	2021-07-30 14:41:06 +02:00
Niels Lohmann	1c030cccf1	✅ add regression test #2824	2021-07-29 15:23:21 +02:00
Niels Lohmann	a563338039	Merge pull request #2825 from ldionne/ldionne-lazy ... Properly constrain the basic_json conversion operator	2021-07-22 12:24:56 +02:00
Niels Lohmann	19a5e12136	CMake cleanup (#2885) ... * 🔥 clean CMake files and Makefile * 💡 update documentation	2021-07-22 09:25:55 +02:00
Niels Lohmann	eba82ecd62	Refactor Unicode tests (#2889) ... * ♻️ split Unicode tests	2021-07-21 21:17:01 +02:00
Louis Dionne	b0e5965d71	Properly constrain the basic_json conversion operator ... Fixes #2491	2021-07-19 11:16:27 -04:00
Niels Lohmann	03270ef090	👥 update contributors	2021-07-19 16:57:15 +02:00
Niels Lohmann	45016c4429	⬆️ update Doxyfile	2021-07-19 16:56:43 +02:00
Niels Lohmann	7066ab128f	🎨 reindent code	2021-07-19 16:56:28 +02: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