4281 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Niels Lohmann	fa5d3b5a9b	👷 run CI for release branches	2021-08-15 22:49:31 +02:00
Niels Lohmann	09237272bc	👥 update documentation	2021-08-15 21:05:26 +02:00
Niels Lohmann	1300d2e4c3	Merge pull request #2908 from nlohmann/issue2863 ... Fix binary subtypes	2021-08-14 14:27:58 +02:00
Niels Lohmann	1aceeff3fc	🚨 fix C4244 warning	2021-08-14 13:40:52 +02:00
Niels Lohmann	0a0eb7a850	Merge branch 'develop' of https://github.com/nlohmann/json into issue2863 ... Conflicts: .github/workflows/windows.yml	2021-08-14 11:19:48 +02:00
Niels Lohmann	6ac037c1f6	Merge pull request #2930 from nlohmann/msvc_warnings_as_error	2021-08-13 21:23:24 +02:00
Niels Lohmann	e5ef44c4dd	Merge pull request #2927 from fhuberts/fix-switch-enum	2021-08-13 19:32:39 +02:00
Niels Lohmann	4b0e04eb68	🚨 fix C4100 warnings	2021-08-13 17:03:55 +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
Niels Lohmann	288cdf9af7	⚗️ add -WX flag to MSVC builds	2021-08-13 14:07:17 +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
Niels Lohmann	fecb01858b	⚗️ add -WX flag to MSVC builds	2021-08-13 13:28:17 +02:00
Niels Lohmann	789280fcb2	🚨 fix C4309 warning	2021-08-13 13:20:26 +02:00
Niels Lohmann	e65db83448	⚗️ add -WX flag to MSVC builds	2021-08-13 12:42:38 +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	523f7c2c9d	💡 update documentation	2021-08-08 13:24:17 +02:00
Niels Lohmann	db7ccafbda	💚 fix MSVC build	2021-08-07 13:55:25 +02:00
Niels Lohmann	a4c3cf7798	💚 fix MSVC build	2021-08-07 13:40:01 +02:00
Niels Lohmann	346c9c1a19	💚 fix MSVC build	2021-08-07 13:37:17 +02:00
Niels Lohmann	c5928501b0	💚 fix MSVC build	2021-08-07 13:19:25 +02:00
Niels Lohmann	176e9bf0ab	✅ add tests for CBOR	2021-08-07 13:14:08 +02:00
Niels Lohmann	b74474e3fd	💚 fix MSVC build	2021-08-07 13:14:00 +02:00
Niels Lohmann	89c98dfc20	✨ add option to process binary subtypes in CBOR	2021-08-06 16:41:01 +02:00
Niels Lohmann	51a9880022	✅ add tests for CBOR	2021-08-06 15:31:11 +02:00
Niels Lohmann	b7db1d68d9	♻️ fix CBOR and BSON	2021-08-06 14:36:38 +02:00
Niels Lohmann	046df035fa	♻️ change type of binary subtype	2021-08-06 13:45:35 +02:00
Niels Lohmann	3eb1fb6be7	♻️ change type of binary subtype	2021-08-06 13:26:00 +02:00
Niels Lohmann	5c38e76c11	Merge branch 'develop' of https://github.com/nlohmann/json into issue2863	2021-08-06 13:23:26 +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	7c19aa2210	♻️ overwork byte_container_with_subtype	2021-08-01 22:00:57 +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