11 Commits

Author	SHA1	Message	Date
Théo DELRIEU	628f76729e	do not check for compatible_object_type in compatible_array_type	2018-09-07 12:18:03 +02:00
Théo DELRIEU	f6febbe359	split meta.hpp, add detected_t (used to define concepts)	2018-08-16 11:58:42 +02:00
Niels Lohmann	39dd775e38	🔨 cleanup after #1134	2018-06-28 21:32:32 +02:00
Niels Lohmann	86a96b059d	Merge pull request #1134 from Daniel599/feature/items_iterator ... fixed compile error for #1045	2018-06-28 21:21:17 +02:00
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	66dd1a846d	🚨 fixed more compiler warnings	2018-06-23 10:47:55 +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	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	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