75 Commits

Author	SHA1	Message	Date
Niels Lohmann	7fa4ddf93e	💄 fixed indentation	2018-06-23 17:27:40 +02:00
Niels Lohmann	bf348ca8a4	Merge pull request #1028 from gracicot/develop ... Added support for string_view in C++17	2018-06-23 17:10:04 +02:00
Niels Lohmann	ed6a0686df	🔨 small refactoring to improve branch coverage ... The branch coverage reported by lcov is weird. The code before and after has the same Godbolt assembler, but the code with the lambda has a better branch coverage.	2018-06-23 17:05:04 +02:00
Niels Lohmann	c02de445bf	🚨 fixed more compiler warnings	2018-06-23 11:00:42 +02:00
Niels Lohmann	66dd1a846d	🚨 fixed more compiler warnings	2018-06-23 10:47:55 +02:00
Niels Lohmann	850922269d	🚨 removed compiler warnings	2018-06-23 10:28:04 +02:00
Théo DELRIEU	2c920a1032	run make amalgamate	2018-06-18 15:14:10 +02:00
Théo DELRIEU	2b37d7ed86	from_json: add overload for std::unordered_map ... Fixes #1133	2018-06-18 15:14:10 +02:00
Théo DELRIEU	299469cfd5	from_json: add missing template arguments for std::map	2018-06-18 10:52:11 +02:00
Guillaume Racicot	14e6278c2f	Merge branch 'develop' of github.com:gracicot/json into develop	2018-06-04 11:18:25 -04:00
Guillaume Racicot	7acd90b651	Fixed check for compatible string type	2018-06-04 11:18:19 -04:00
Guillaume Racicot	5676a2a076	Aligned template declaration	2018-06-03 23:51:07 -04:00
Guillaume Racicot	e0e7fa39e7	Re-added external_constructor with string compatible types	2018-06-03 23:49:13 -04:00
Matthias Möller	ecadcdb593	added char cast ... should fix the GCC unittest	2018-05-31 16:36:16 +02:00
Matthias Möller	48656a49f5	typo	2018-05-31 15:32:21 +02:00
Matthias Möller	64acb42aa7	remove stringstream dependency	2018-05-31 13:45:58 +02:00
Niels Lohmann	0efaf891e5	Merge pull request #1089 from theodelrieu/feature/map_conversion ... Provide a from_json overload for std::map	2018-05-28 14:53:23 +02:00
Théo DELRIEU	c5e63fd684	Provide a from_json overload for std::map ... This overload is chosen only when BasicJsonType::string_t is not constructible from std::map::key_type. Currently, converting a map to json treats it as an array of pairs. fixes #1079	2018-05-28 11:06:24 +02:00
Niels Lohmann	db03d09312	Merge branch 'feature/key_ref' into develop (fixes #1098)	2018-05-27 22:26:00 +02:00
Niels Lohmann	3cdc4d784b	📝 added documentation	2018-05-27 18:07:53 +02:00
Niels Lohmann	481ace65c4	🔨 only calculate array index string when needed #1098	2018-05-27 12:04:22 +02:00
Niels Lohmann	90eb0a91e0	⚡ keys are now returned as const reference #1098	2018-05-26 13:26:40 +02:00
Niels Lohmann	e94862a649	🚑 fixed error in callback logic	2018-05-06 19:00:49 +02:00
Niels Lohmann	ae213721b1	🔨 removed unget function for wstring parsers	2018-05-06 14:05:29 +02:00
Niels Lohmann	5ff2abb90d	Merge branch 'develop' into feature/sax2	2018-05-06 13:29:23 +02:00
Niels Lohmann	cf91b4f2bb	Merge branch 'develop' into feature/wstring	2018-04-08 11:36:58 +02:00
Niels Lohmann	e1ea8369ad	Merge branch 'develop' into feature/sax2	2018-04-08 09:31:59 +02:00
Niels Lohmann	1e08654f99	🔨 cleanup	2018-04-02 22:25:17 +02:00
Niels Lohmann	aa89c5e048	🔨 removing unget_character() function from input adapters #834	2018-04-02 21:10:48 +02:00
Niels Lohmann	16c5bfeaad	👌 fixed compiler warnings #1031	2018-04-02 13:01:56 +02:00
Niels Lohmann	eb06d0531a	🚧 added input adapter for wide strings #1031	2018-04-01 19:12:36 +02:00
Niels Lohmann	ba6edd5634	🔨 cleanup	2018-03-30 00:38:18 +02:00
Niels Lohmann	850671b9f1	🔨 using a vector<bool> for the parser hierarchy	2018-03-29 18:45:43 +02:00
Niels Lohmann	5f723bbec6	🔨 realized callback parser wirh SAX interface #971	2018-03-28 23:39:39 +02:00
Niels Lohmann	896a9db461	🔨 improved code #1021	2018-03-28 19:37:21 +02:00
Niels Lohmann	a9baab76c2	🚑 fix for #1021	2018-03-28 18:20:55 +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	99ecca55c4	✅ improved test coverage	2018-03-20 18:49:10 +01:00
Niels Lohmann	9e07e9b4ec	✨ implemented non-throwing binary reader	2018-03-19 22:48:13 +01:00
Niels Lohmann	a271ee5f16	♻️ proper use of SAX parser for binary formats	2018-03-18 23:00:45 +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	c87ffad45c	♻️ implemented a non-recursive parser	2018-03-17 14:46:50 +01:00
Guillaume Racicot	8165707990	basic_json now supports getting many type of strings	2018-03-15 15:35:00 -04:00
Niels Lohmann	282bafae4f	🔨 fixed compilation error	2018-03-14 07:18:42 +01:00
Niels Lohmann	abac6a0e84	Merge branch 'develop' into feature/sax2	2018-03-13 23:58:17 +01:00
Niels Lohmann	8557151d90	♻️ adjusting lexer/parser in symmetry to #1006	2018-03-12 19:15:11 +01:00