9 Commits

Author	SHA1	Message	Date
Niels Lohmann	9d726c25d5	♻️ remove "#define private public"	2020-08-12 13:30:06 +02:00
Théo DELRIEU	74b446f5fd	add a switch to enable implicit conversions (defaults to true) ... wrap implicit conversions tests around the JSON_USE_IMPLICIT_CONVERSIONS macro	2020-07-22 10:49:01 +02:00
Niels Lohmann	98b1c6d302	🚩 use JSON_ASSERT(x) instead of assert(x)	2020-07-06 12:22:31 +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	d359fd3a8d	🚧 trying nodiscard attribute #1433	2019-01-19 17:32:23 +01:00
Théo DELRIEU	b59c3367c9	use detected instead of has_* traits	2018-09-07 12:17:59 +02:00
Hyeon Kim	d0e60de433	Add new JSON_INTERNAL_CATCH macro function	2018-07-19 15:43:41 +09: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