3479 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Francois Chabot	b9416a26aa	correct ADL lookup of arrays on Mac and Windows	2020-05-27 13:21:23 -04:00
Francois Chabot	f1969e60a3	reamalgamate	2020-05-27 12:56:26 -04:00
Francois Chabot	5684d9a498	unified input API	2020-05-27 12:40:04 -04:00
Niels Lohmann	d70d06ae41	Merge pull request #2137 from dota17/MSC_VER ... Fix issue 2112	2020-05-27 08:49:19 +02:00
Niels Lohmann	3c60a66c4c	Merge pull request #2104 from dota17/issue#2086 ... Fix issue#2086: disallow json::value_t type parameter in value()	2020-05-26 13:15:06 +02:00
Niels Lohmann	27fe50dc92	📝 add example for contains #2133 ... Closes #2133.	2020-05-26 12:46:04 +02:00
Niels Lohmann	25aab7ee41	Merge pull request #2136 from aokellermann/CircleCI_GCC_BleedingEdge ... Add bleeding edge GCC to CI	2020-05-26 12:39:42 +02:00
chenguoping	eb50fbf926	fix issue 2112	2020-05-26 16:43:16 +08:00
Antony Kellermann	49000cd77d	Update documentation to reflect addition of Arch Linux CI testing.	2020-05-25 20:46:39 -04:00
Antony Kellermann	5a72cfa0c3	Add base and base-devel to list of arch linux programs to install.	2020-05-25 20:43:15 -04:00
Antony Kellermann	1d57ddd2d4	Add -y flag to pacman to sync repos.	2020-05-25 20:24:54 -04:00
Antony Kellermann	41a84b1202	Add workflows for CircleCI so that build_stable and build_bleeding_edge jobs can run concurrently.	2020-05-25 20:17:02 -04:00
Antony Kellermann	eff2f51071	Add build_bleeding_edge job to CircleCI, mimicking the original job except using the latest Arch Linux docker image.	2020-05-25 20:14:49 -04:00
Antony Kellermann	bf4a090075	Rename build job to build_stable to be more descriptive.	2020-05-25 20:12:54 -04:00
Niels Lohmann	c92a696852	📝 update documentation	2020-05-22 18:21:37 +02:00
Niels Lohmann	88292d9499	🚨 remove redundant assertions	2020-05-22 14:19:07 +02:00
Niels Lohmann	a82c80e9af	Merge pull request #2125 from nlohmann/binary_type ... Clean up implementation of binary type	2020-05-20 18:58:29 +02:00
Niels Lohmann	ae29456b3f	🚸 overwork report templates	2020-05-20 18:57:21 +02:00
Niels Lohmann	a861bdb81f	Merge pull request #2121 from gistrec/fix_compilation_error_msvc ... Fixed a compilation error in MSVC	2020-05-19 13:55:37 +02:00
Niels Lohmann	4d39644bd0	💚 fix build	2020-05-19 13:45:52 +02:00
Niels Lohmann	21b1680ea1	🚚 rename binary_array() to binary()	2020-05-19 13:30:22 +02:00
Niels Lohmann	86b053e916	Merge branches 'binary_type' and 'develop' of https://github.com/nlohmann/json into binary_type	2020-05-19 13:10:35 +02:00
Niels Lohmann	952a87a4f4	🚚 move byte container outside detail namespace	2020-05-19 13:08:18 +02:00
Niels Lohmann	79347b484b	✅ improve test coverage	2020-05-19 12:40:32 +02:00
Niels Lohmann	5cfa8a586e	👷 run workflows on pull requests	2020-05-18 14:01:54 +02:00
Niels Lohmann	b7ff40029a	💥 change serialization of binary values	2020-05-18 13:53:20 +02:00
Niels Lohmann	9eb19bcc27	✅ add more tests for binary type	2020-05-18 12:33:26 +02:00
gistrec	9e765f5aed	Fixed std::numeric_limit::max() call	2020-05-18 10:25:55 +00:00
gistrec	3f0cf26f7a	changes to the single header were applied	2020-05-18 10:17:45 +00:00
gistrec	454480f581	fixed a compilation error in MSVC	2020-05-18 14:57:04 +07:00
Niels Lohmann	5dec7166ea	Merge branches 'binary_type' and 'develop' of https://github.com/nlohmann/json into binary_type	2020-05-18 09:13:22 +02:00
Niels Lohmann	16d78a82e0	👷 add link to GitHub workflows	2020-05-18 09:12:18 +02:00
Niels Lohmann	c237aa3a68	Merge pull request #2119 from nlohmann/release_cleanup ... Overwork CI	2020-05-18 09:07:36 +02:00
Niels Lohmann	904642f261	♻️ rename internal_binary_t with binary_t	2020-05-17 22:50:27 +02:00
Niels Lohmann	1ce8a5be87	Merge branch 'develop' of https://github.com/nlohmann/json into release_cleanup	2020-05-17 14:11:49 +02:00
Niels Lohmann	dead99eb0e	🔨 overwork binary subtypes	2020-05-17 13:51:59 +02:00
Niels Lohmann	ab6e76dd05	Merge branches 'binary_type' and 'develop' of https://github.com/nlohmann/json into binary_type	2020-05-17 12:27:58 +02:00
Niels Lohmann	3799b3f8dd	Merge pull request #2116 from nlohmann/issue2113 ... Fix warnings from Clang 10 and GCC 9	2020-05-17 12:19:06 +02:00
Niels Lohmann	6154d50a9f	Merge pull request #2115 from nlohmann/issue2089 ... Do not include <ciso646> when using C++17	2020-05-17 12:17:17 +02:00
Niels Lohmann	28e20bd9e4	🚨 fix warnings #2113	2020-05-16 14:26:17 +02:00
Niels Lohmann	ad32f576bd	Merge branch 'develop' of https://github.com/nlohmann/json into release_cleanup	2020-05-16 13:22:23 +02:00
Niels Lohmann	c0cf67ead3	Merge branch 'develop' of https://github.com/nlohmann/json into binary_type	2020-05-16 12:58:13 +02:00
Niels Lohmann	f40a9f876a	Merge pull request #2044 from dota17/issue#1719 ... Fix issue#1719	2020-05-16 12:57:00 +02:00
Niels Lohmann	3ed059f6ff	⏪ revert faulty changes	2020-05-16 12:56:18 +02:00
Niels Lohmann	bc1886fb60	♻️ refine interface of wrapped_binary_t	2020-05-15 23:21:49 +02:00
Niels Lohmann	a452e8a0a1	💚 fix GCC 4.9 compilation	2020-05-15 22:38:18 +02:00
chenguoping	ed9c205b5d	add somes test cases	2020-05-15 21:48:29 +08:00
chenguoping	5dd27f1a9f	compare against max float and min float before converting	2020-05-15 21:47:59 +08:00
Niels Lohmann	daf2d296dd	♻️ move wrapped binary type to separate file	2020-05-15 14:12:32 +02:00
chenguoping	779a0ec7df	update	2020-05-15 17:35:43 +08:00