2284 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Jared Grubb	f2873e6d3a	README: adjust boost::optional example ... The "from_json" example for boost::optional is not complete and should also handle the 'none' case.	2017-01-29 02:46:58 +00:00
Niels Lohmann	c7f366520c	Merge branch 'develop' into coverity_scan	2017-01-28 18:43:48 +01:00
Niels Lohmann	f642934b18	🔀 merge branch 'release/2.1.0' into develop	2017-01-28 18:43:01 +01:00
Niels Lohmann	6746a57524	📝 updated slides	2017-01-28 18:41:30 +01:00
Niels Lohmann	eb08e8b09b	📝 updated documentation	2017-01-28 18:20:12 +01:00
Niels Lohmann	4b5c61075f	📄 changes to let Github detect the license	2017-01-28 18:17:57 +01:00
Niels Lohmann	38e4935db0	📝 added example and documentation for the meta function	2017-01-28 17:12:29 +01:00
Niels Lohmann	cdde1a9436	🔖 set version to 2.1.0	2017-01-28 16:46:03 +01:00
Niels Lohmann	d870826811	🔖 set version to 2.1.0	2017-01-28 16:03:35 +01:00
Niels Lohmann	2f6260751c	📝 fixed #434	2017-01-27 18:50:52 +01:00
Niels Lohmann	42fa3f0568	🔀 merge pull request #435 (based on #338, #355, and #423) ... conversion from/to user-defined types	2017-01-27 06:22:10 +01:00
Niels Lohmann	cd9701b123	💄 cleanup	2017-01-26 20:51:30 +01:00
Niels Lohmann	1305e03557	📝 fixed documentation	2017-01-26 19:39:34 +01:00
Niels Lohmann	77bb7af5d9	📝 added more documentation	2017-01-26 07:29:37 +01:00
Niels Lohmann	4d3053cd42	💄 some cleanup	2017-01-25 22:21:07 +01:00
Niels Lohmann	94d9b7bc86	📝 overworked documentation (re-added constructor examples)	2017-01-25 21:59:54 +01:00
Niels Lohmann	ec03c9c53e	📝 overworked docs #435	2017-01-25 19:01:31 +01:00
Mihai STAN	6198439f59	fix #414 - comparing to 0 literal ... Overload comparison operators for all types that could be converted to nullptr.	2017-01-24 22:33:37 +02:00
Niels Lohmann	4139bb6572	📝 adjusted test count	2017-01-24 15:20:20 +01:00
Niels Lohmann	c154f3133d	🚧 rephrased assertions	2017-01-24 15:02:35 +01:00
Niels Lohmann	50a3f3b301	📝 added nicer example	2017-01-24 14:55:51 +01:00
Niels Lohmann	781fd09f2d	📝 cleanup	2017-01-24 14:45:32 +01:00
Niels Lohmann	daf8dcdb32	📝 overworked README	2017-01-24 14:37:25 +01:00
Niels Lohmann	250e5bf43d	💄 overworked documentation and indentation	2017-01-24 13:47:33 +01:00
Niels Lohmann	030cf674ef	🚧 fixed a warning	2017-01-24 12:49:38 +01:00
Niels Lohmann	3857e55290	💄 ran "make pretty"	2017-01-24 12:43:43 +01:00
Théo DELRIEU	9f103d19d7	add implicit conversions test (operator T())	2017-01-22 14:23:24 +01:00
Théo DELRIEU	9f8b270ed9	fix some warnings	2017-01-22 14:07:28 +01:00
Théo DELRIEU	9c6ef74a28	add static_asserts/remove the need for CopyConstructible in get	2017-01-21 19:12:40 +01:00
Théo DELRIEU	ba0b35f414	use typename U = uncvref_t where appropriate	2017-01-21 19:12:40 +01:00
Théo DELRIEU	37fd20b2eb	put uncvref_t, enable_if_t, value_t and operator<(value_t) in detail	2017-01-21 19:12:40 +01:00
Théo DELRIEU	7d771c71ed	put back type_name in basic_json ... This can however not be done easily for value_t, since external_constructor depends on it, as is operator< which was moved outside basic_json too. This is not really an issue, since all basic_json classes share the same enum	2017-01-21 19:12:40 +01:00
Théo DELRIEU	f997758cad	remove useless forward declaration of primitive_iterator_t	2017-01-21 19:12:40 +01:00
Théo DELRIEU	40ba5a8b7b	remove inline keyword from anonymous namespace (not needed)	2017-01-21 19:12:40 +01:00
Théo DELRIEU	7f359017d2	rename template argument Json -> BasicJsonType	2017-01-21 19:12:40 +01:00
Théo DELRIEU	708eb9613b	disable reserve tests when exceptions are disabled	2017-01-21 19:12:40 +01:00
Théo DELRIEU	889b269a4f	rename template argument: BasicJson -> Json	2017-01-21 16:14:23 +01:00
Théo DELRIEU	a6b028286b	move conjunction/disjunction to the top of detail	2017-01-21 16:14:23 +01:00
Théo DELRIEU	d566bb81c4	use switchs where appropriate	2017-01-21 16:14:23 +01:00
Théo DELRIEU	1e20887cff	use JSON_THROW	2017-01-21 16:14:22 +01:00
Théo DELRIEU	447c6a670f	run make re2c	2017-01-21 16:14:22 +01:00
Théo DELRIEU	3e15b551e0	run make pretty	2017-01-21 16:14:22 +01:00
Théo DELRIEU	fbac056c38	add readme	2017-01-21 16:14:22 +01:00
Théo DELRIEU	b56117b148	add noexcept tests	2017-01-21 16:14:22 +01:00
Théo DELRIEU	af94e712c7	add basic doxygen documentations	2017-01-21 16:14:22 +01:00
Théo DELRIEU	1d87097741	remove some boilerplate	2017-01-21 16:14:22 +01:00
Théo DELRIEU	e60e458a7e	move static_const to the detail namespace	2017-01-21 16:14:22 +01:00
Théo DELRIEU	794dae8911	apply changes to json.hpp.re2c	2017-01-21 16:14:22 +01:00
Théo DELRIEU	68081cd112	remove useless file	2017-01-21 16:14:22 +01:00
Théo DELRIEU	07bc82d3a7	put const to the left	2017-01-21 16:14:22 +01:00