330 Commits

Author	SHA1	Message	Date
Niels Lohmann	323cf95d8c	🚨 fix linter warning	2019-07-21 14:04:49 +02:00
Niels Lohmann	cf8251eb54	🚑 fix compiler errors	2019-07-14 21:19:55 +02:00
Niels Lohmann	a501365ea2	Merge branch 'feature/hedley' into develop	2019-07-14 20:58:08 +02:00
Niels Lohmann	b17440c12f	🚨 fix compiler warnings	2019-07-12 21:05:16 +02:00
Niels Lohmann	104c5c1996	Merge branch 'feature/json_pointer_contains' into develop	2019-07-09 08:08:56 +02:00
Niels Lohmann	7a23aa1c0d	Merge branch 'feature/emplace_back' into develop	2019-07-09 08:06:27 +02:00
Niels Lohmann	947656544d	🚨 fix warnings	2019-07-02 21:06:42 +02:00
Niels Lohmann	346e9813c5	🚧 add more annotations	2019-07-02 20:25:51 +02:00
Niels Lohmann	9289a23a76	Merge pull request #1643 from kevinlul/develop ... Fix json.hpp compilation issue with other typedefs with same name (Issue #1642)	2019-07-01 22:57:04 +02:00
Niels Lohmann	90798caa62	🚚 rename Hedley macros	2019-07-01 22:37:30 +02:00
Niels Lohmann	025f4cea42	🚨 fix warning	2019-07-01 22:29:21 +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	1be63431f3	✨ make emplace_back return a reference #1609	2019-06-30 12:19:41 +02:00
Niels Lohmann	258fa798f1	✨ add contains function for JSON pointers	2019-06-30 10:03:08 +02:00
Isaac Nickaein	3db14cbfae	📝 Improve doc on const_inter constructor	2019-06-24 15:40:01 +04:30
Isaac Nickaein	798e83a038	Workaround msvc2015 bug with explicit copy-constructor for const_iterator	2019-06-22 21:15:11 +04:30
Niels Lohmann	3b82a350ed	📝 mention 302 exception in value() documentation #1601	2019-06-22 09:44:12 +02:00
kevinlul	f4fca2d59a	Fix #1642 ... While in our case, only the string case was affected, to be safe and allow the library to work with other unforeseen cases, all of the cases have been wrapped with parentheses. Thank you @DyXel and @edo9300	2019-06-16 18:22:40 -04:00
Macr0Nerd	aa4c45ee4d	Added to_string (with ugly macro) and tests	2019-04-26 18:10:45 -05:00
Théo DELRIEU	e6e6805c6c	add built-in array support in get_to	2019-04-01 17:47:45 +02:00
Théo DELRIEU	2806b201a8	make sure values are overwritten in from_json overloads ... Caused unexpected behaviors when using get_to with values previously set. Fixes !1511	2019-04-01 17:47:42 +02:00
Niels Lohmann	b52c3638f5	Merge pull request #1551 from heavywatal/fix-1535-nodiscard-clang ... Remove C++17 extension warning from clang; #1535	2019-03-29 09:14:25 +01:00
Niels Lohmann	d21d298397	🎨 fixed indentation	2019-03-28 14:23:26 +01:00
Watal M. Iwasaki	5ccdaf643f	Remove C++17 extension warning from clang; #1535 ... - Switch off `nodiscard` for clang unless C++17 is detected. - Detect C++ standard before the switch.	2019-03-28 14:38:58 +09:00
Niels Lohmann	efa1b9a7bb	🔖 set version to 3.6.1	2019-03-20 20:50:05 +01:00
Niels Lohmann	b33093d610	🐛 fixed regression #1530	2019-03-20 14:40:23 +01:00
Niels Lohmann	9d6ab9014f	🏁 fixed a compilation error in MSVC #1531	2019-03-20 14:13:29 +01:00
Niels Lohmann	c790b9f8c0	🐛 fixed regression #1530	2019-03-20 12:41:08 +01:00
Niels Lohmann	7c55510f76	🚨 fixed some warnings #1527	2019-03-20 11:06:39 +01:00
Niels Lohmann	b37392b7ac	🔖 set version to 3.6.0	2019-03-20 00:19:07 +01:00
Niels Lohmann	002addabd8	🚨 fixed a warning	2019-03-19 23:10:21 +01:00
Niels Lohmann	18cc7ddd62	📝 completed documentation index page	2019-03-19 16:03:02 +01:00
Niels Lohmann	e07e8e7912	📝 updated documentation	2019-03-19 15:40:23 +01:00
Niels Lohmann	710f26f95c	📝 added documentation	2019-03-19 10:06:35 +01:00
Niels Lohmann	b224c52376	🎨 cleanup	2019-03-19 09:17:14 +01:00
Niels Lohmann	37a72dac48	💚 forgot two semicolons	2019-03-18 17:23:34 +01:00
Niels Lohmann	8d3f4f21bc	🔨 clean up	2019-03-18 13:53:48 +01:00
Niels Lohmann	22c733e6fe	📝 added documentation	2019-03-17 22:25:18 +01:00
Niels Lohmann	56f6d1d68e	💚 fix CI and #1521	2019-03-17 15:20:22 +01:00
Niels Lohmann	b8451c236f	🚨 fixed warnings	2019-03-17 12:01:49 +01:00
Niels Lohmann	34f8b4f711	🚨 fixed more warnings	2019-03-17 00:27:44 +01:00
Niels Lohmann	b02ee16721	🚨 fixed warnings	2019-03-15 15:55:52 +01:00
Niels Lohmann	8d6c033f80	Merge branch 'develop' of https://github.com/nlohmann/json into develop	2019-03-15 14:55:15 +01:00
Niels Lohmann	27011e3718	🚨 fixed warnings	2019-03-15 14:55:13 +01:00
Ferenc Nasztanovics	0067ea8f9e	Change macros to numeric_limits #1483	2019-03-13 23:44:34 +01:00
Niels Lohmann	0c65ba960e	Merge branch 'develop' of https://github.com/nlohmann/json into develop	2019-03-13 22:14:57 +01:00
Niels Lohmann	546e2cbf5e	🚨 fixed some warnings	2019-03-13 22:14:53 +01:00
Niels Lohmann	c6fc902184	Merge pull request #1489 from andreas-schwab/develop ... Do proper endian conversions	2019-03-13 11:57:58 +01:00
Niels Lohmann	c983b67112	Merge pull request #1469 from garethsb-sony/json_pointer-append ... Add operator/= and operator/ to construct a JSON pointer by appending two JSON pointers	2019-03-11 22:47:08 +01:00