12 commits

Author	SHA1	Message	Date
Guillaume Racicot	8165707990	basic_json now supports getting many type of strings	2018-03-15 15:35:00 -04:00
Niels Lohmann	8557151d90	♻️ adjusting lexer/parser in symmetry to #1006	2018-03-12 19:15:11 +01:00
Vitaliy Manushkin	830f3e5290	forward alternative string class from output_adapter to output_string_adapter	2018-03-10 23:58:16 +03:00
Vitaliy Manushkin	faccc37d0d	dump to alternate implementation of string, as defined in basic_json template	2018-03-10 17:19:28 +03:00
Niels Lohmann	aa8fc2a41c	🚑 hopefully fixed the memory leak	2018-03-08 17:11:15 +01:00
Niels Lohmann	97559bb1b2	🔨 trying to fix the leak ... Part 1: properly use forwarding	2018-03-08 07:36:56 +01:00
Niels Lohmann	d2d65bb25b	♻️ refined SFINAE to fix some warnings	2018-03-07 22:01:44 +01:00
Théo DELRIEU	8711ec6034	support construction from other basic_json types ... Before this patch, `basic_json` types with different template arguments were treated as `CompatibleArrayType`. Which sometimes leads to recursive calls and stack overflows. This patch adds a constructor and a `get` overload to deal with different `basic_json` types.	2018-02-27 16:48:09 +01:00
Théo DELRIEU	01d6118828	Fix constraints on from_json(CompatibleArrayType) ... Fixes #924	2018-02-12 15:37:33 +01:00
Niels Lohmann	33a9b00ce6	🐛 fix for #962 ... Added out_of_range exception for UBJSON containers with sizes that exceed the target container's max_size.	2018-02-06 22:38:53 +01:00
Niels Lohmann	8b457ace25	🐛 fixing CBOR's indefinity length strings #961 ... Beside the fix discussed in #961, we also had to re-adjust a test case. It seems that it was failing before, and I "fixed" it to work with the broken implementation...	2018-02-06 20:43:03 +01:00
Théo DELRIEU	14cd019861	fix cmake install directory (for real this time) ... * Rename 'develop' folder to 'include/nlohmann' * Rename 'src' folder to 'single_include/nlohmann' * Use <nlohmann/*> headers in sources and tests * Change amalgamate config file	2018-02-01 11:06:51 +01:00