60 commits

Author	SHA1	Message	Date
Théo DELRIEU	299469cfd5	from_json: add missing template arguments for std::map	2018-06-18 10:52:11 +02:00
Danielc	1566ad4053	fixed compile error for #1045; to_json for iternation_proxy_internal was needed	2018-06-16 12:01:49 +03: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
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
Guillaume Racicot	8165707990	basic_json now supports getting many type of strings	2018-03-15 15:35:00 -04:00
Théo DELRIEU	01d6118828	Fix constraints on from_json(CompatibleArrayType) ... Fixes #924	2018-02-12 15:37:33 +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