55 Commits

Author	SHA1	Message	Date
aodq	15ec0fe150	change c-style cast to static_cast for #2304	2020-07-24 16:21:30 -04:00
aodq	12885446d8	fixes unused variable 'ex' for #2304	2020-07-23 13:21:38 -04:00
Niels Lohmann	d047b3d495	🚨 remove linter warning	2020-07-16 14:45:39 +02:00
Niels Lohmann	dc06f100be	Merge branch 'develop' of https://github.com/nlohmann/json into clang_windows ... Conflicts: include/nlohmann/detail/input/binary_reader.hpp include/nlohmann/detail/input/json_sax.hpp include/nlohmann/detail/input/lexer.hpp include/nlohmann/detail/input/parser.hpp include/nlohmann/detail/json_pointer.hpp include/nlohmann/detail/output/serializer.hpp include/nlohmann/json.hpp single_include/nlohmann/json.hpp	2020-07-11 14:04:40 +02:00
Niels Lohmann	98b1c6d302	🚩 use JSON_ASSERT(x) instead of assert(x)	2020-07-06 12:22:31 +02:00
Niels Lohmann	ac3922c7aa	Merge branch 'develop' of https://github.com/nlohmann/json into clang_windows ... Conflicts: include/nlohmann/detail/input/binary_reader.hpp include/nlohmann/detail/input/input_adapters.hpp include/nlohmann/detail/input/lexer.hpp include/nlohmann/detail/output/binary_writer.hpp include/nlohmann/json.hpp single_include/nlohmann/json.hpp	2020-06-27 13:14:48 +02:00
Niels Lohmann	8b3d2399a4	🚨 remove warnings	2020-06-22 22:32:21 +02:00
Niels Lohmann	0498202a03	🎨 replace alternative operators (and, not, or)	2020-06-03 14:20:36 +02:00
chenguoping	4350c5ed97	fix bug in issue#1972	2020-05-30 17:15:56 +08:00
Niels Lohmann	904642f261	♻️ rename internal_binary_t with binary_t	2020-05-17 22:50:27 +02:00
Niels Lohmann	dead99eb0e	🔨 overwork binary subtypes	2020-05-17 13:51:59 +02:00
Niels Lohmann	daf2d296dd	♻️ move wrapped binary type to separate file	2020-05-15 14:12:32 +02:00
Niels Lohmann	f0c6ab4d3b	🐛 fix bug in SAX callback parser	2020-05-08 14:21:11 +02:00
Michael Reilly	012c9665ac	Add binary type support to all binary file formats, as well as an internally represented binary type	2020-04-14 10:22:45 -04:00
Niels Lohmann	90798caa62	🚚 rename Hedley macros	2019-07-01 22:37:30 +02:00
Niels Lohmann	897362191d	🔨 add NLOHMANN_JSON prefix and undef macros	2019-07-01 22:24:39 +02:00
Niels Lohmann	1720bfedd1	⚗️ add Hedley annotations	2019-06-30 22:14:02 +02:00
Niels Lohmann	37a72dac48	💚 forgot two semicolons	2019-03-18 17:23:34 +01:00
Niels Lohmann	8d3f4f21bc	🔨 clean up	2019-03-18 13:53:48 +01:00
Niels Lohmann	56f6d1d68e	💚 fix CI and #1521	2019-03-17 15:20:22 +01:00
Niels Lohmann	b8451c236f	🚨 fixed warnings	2019-03-17 12:01:49 +01:00
Niels Lohmann	27011e3718	🚨 fixed warnings	2019-03-15 14:55:13 +01:00
Niels Lohmann	3cd1dac653	🚨 fix MSVC warning #1502	2019-03-11 15:33:23 +01:00
Niels Lohmann	5c04cc1009	🔨 fixed includes	2019-01-13 15:31:22 +01:00
Niels Lohmann	e426219256	Merge pull request #1282 from nlohmann/feature/lines_columns ... Improve diagnostic messages	2018-10-08 22:17:33 +02:00
Niels Lohmann	f8158997b5	📝 fixed documentation	2018-10-07 21:30:58 +02:00
Niels Lohmann	3abb788139	🚨 fixed some more clang-tidy warnings	2018-10-07 19:07:58 +02:00
Niels Lohmann	858e75c4df	🚨 fixed some clang-tidy warnings	2018-10-07 18:39:18 +02:00
Niels Lohmann	3811daa8a3	📝 release preparation	2018-08-18 12:00:14 +02:00
Niels Lohmann	e33b31e6aa	🐛 fixed callback-related issue (https://github.com/nlohmann/json/issues/971#issuecomment-413678360)	2018-08-17 23:09:45 +02:00
Niels Lohmann	b5c54b41fd	📝 overworked documentation	2018-08-16 21:53:47 +02:00
Niels Lohmann	07494e06d7	🚨 fixed some compiler warnings	2018-08-16 18:20:30 +02:00
Théo DELRIEU	9bbb133094	remove no_limit constant and default values	2018-08-16 11:59:05 +02:00
Théo DELRIEU	442886d040	use templates in the sax interface instead of virtuals	2018-08-16 11:58:52 +02:00
Niels Lohmann	66dd1a846d	🚨 fixed more compiler warnings	2018-06-23 10:47:55 +02:00
Niels Lohmann	3cdc4d784b	📝 added documentation	2018-05-27 18:07:53 +02:00
Niels Lohmann	e94862a649	🚑 fixed error in callback logic	2018-05-06 19:00:49 +02:00
Niels Lohmann	1e08654f99	🔨 cleanup	2018-04-02 22:25:17 +02:00
Niels Lohmann	5f723bbec6	🔨 realized callback parser wirh SAX interface #971	2018-03-28 23:39:39 +02:00
Niels Lohmann	4f6b2b6429	🔨 changed SAX interface	2018-03-21 20:12:06 +01:00
Niels Lohmann	9e1abb4842	✅ improved coverage	2018-03-20 22:39:08 +01:00
Niels Lohmann	943d641054	🔨 some refactoring	2018-03-18 16:07:21 +01:00
Niels Lohmann	22929fe189	🚧 started a SAX/DOM/callback parser	2018-03-18 15:13:53 +01:00
Niels Lohmann	375b05a17d	🔨 cleanup	2018-03-17 23:31:18 +01:00
Niels Lohmann	606a25195f	✅ improved test coverage	2018-03-17 19:15:59 +01:00
Niels Lohmann	282bafae4f	🔨 fixed compilation error	2018-03-14 07:18:42 +01:00
Niels Lohmann	3d4f6a2940	🔨 cleaner exception interface	2018-03-11 22:47:25 +01:00
Niels Lohmann	ad47b0fbde	♻️ refactored binary readers to use a SAX parser	2018-03-11 18:47:38 +01:00
Niels Lohmann	8b379948d0	🔥 replaced acceptor with SAX parser	2018-03-07 22:40:48 +01:00
Niels Lohmann	5beab80553	🔨 using the SAX-DOM parser	2018-03-06 18:17:07 +01:00