12 Commits

Author	SHA1	Message	Date
Niels Lohmann	dbfd7e532b	Merge branch 'develop' of https://github.com/nlohmann/json into develop	2018-01-23 16:33:10 +01:00
Niels Lohmann	3c68a796df	🔥 deprecated iterator_wrapper #874 ... Also fixed some warnings from GCC.	2018-01-23 16:33:08 +01:00
Niels Lohmann	f5c4e9f3a1	Merge pull request #919 from theodelrieu/fix/sfinae_for_incomplete_types ... fix sfinae on basic_json UDT constructor	2018-01-23 07:32:06 +01:00
Niels Lohmann	7eabb6ba36	📝 updated documentation for UBJSON functions	2018-01-22 23:23:17 +01:00
Niels Lohmann	9e5d901f55	Merge branch 'feature/ubjson' into develop	2018-01-21 14:04:29 +01:00
Niels Lohmann	327b8bb09e	Merge branch 'feature/strings' into develop	2018-01-21 13:55:52 +01:00
Niels Lohmann	a8f711a2f1	➕ using Google Benchmark #921	2018-01-18 21:57:21 +01:00
Théo DELRIEU	dcee778c1e	fix sfinae on basic_json UDT constructor ... Avoid compiler errors when performing SFINAE checks on basic_json and incomplete types.	2018-01-17 12:17:38 +01:00
Niels Lohmann	afe4571309	🔨 cleanup + some noexcept	2018-01-16 20:41:04 +01:00
Niels Lohmann	541b46132d	♻️ adjusted code to split headers	2018-01-14 10:34:43 +01:00
Niels Lohmann	c772c01a48	♻️ refactored code to split headers	2018-01-14 10:27:30 +01:00
Niels Lohmann	0a2920e0fd	♻️ reorganized code	2018-01-09 18:30:02 +01:00