| 
								
								
									 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 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 3cd1dac653 | 🚨 fix MSVC warning #1502 | 2019-03-11 15:33:23 +01:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 5047c7a217 | 🐛 added missing include #1500 | 2019-03-10 22:26:57 +01:00 |  | 
				
					
						| 
								
								
									 lieff | 7b31e56fbf | fix GCC 7.1.1 - 7.2.1 on CentOS closes https://github.com/nlohmann/json/issues/670 | 2019-02-25 16:38:22 +03:00 |  | 
				
					
						| 
								
								
									 Andreas Schwab | bb22b1003f | Do proper endian conversions This fixes all testsuite failures on big endian hosts. | 2019-02-25 12:09:13 +01:00 |  | 
				
					
						| 
								
								
									 garethsb-sony | 08de9eeaca | Add json_pointer::parent_pointer (cf. std::filesystem::path::parent_path) | 2019-02-25 09:26:08 +00:00 |  | 
				
					
						| 
								
								
									 garethsb-sony | 164e0e54d9 | Rename private json_pointer::is_root as public json_pointer::empty for consistency with std::filesystem::path | 2019-02-25 09:26:07 +00:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | e326df211b | Merge pull request #1474 from nickaein/develop Implement contains() member function | 2019-02-13 13:05:21 +01:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | c55cacee1e | Merge pull request #1477 from nickaein/fix-doc Fix documentation | 2019-02-13 13:03:46 +01:00 |  | 
				
					
						| 
								
								
									 Isaac Nickaein | 6a5db00951 | Implement contains() to check existence of a key | 2019-02-13 13:21:54 +03:30 |  | 
				
					
						| 
								
								
									 Isaac Nickaein | fb5ceb26ac | Fix documentation Remove two instance of duplicate paragraphs. | 2019-02-11 17:00:48 +03:30 |  | 
				
					
						| 
								
								
									 garethsb-sony | c850e9d82d | Add operator/= and operator/ to construct a JSON pointer by appending two JSON pointers, as well as convenience op/= and op= to append a single unescaped token or array index; inspired by std::filesystem::path | 2019-01-31 19:15:50 +00:00 |  | 
				
					
						| 
								
								
									 past-due | 45819dce54 | Disable -Wmismatched-tags warning on tuple_size / tuple_element | 2019-01-30 12:59:50 -05:00 |  | 
				
					
						| 
								
								
									 Isaac Nickaein | 372c4d2125 | Merge branch 'develop' into iterate-on-destruction | 2019-01-28 02:41:22 +03:30 |  | 
				
					
						| 
								
								
									 Patrick Boettcher | a06e7f5d80 | JSON-pointer: add operator+() returning a new json_pointer | 2019-01-24 16:46:51 +01:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | e89c946451 | Merge branch 'feature/nodiscard' into develop | 2019-01-20 15:41:30 +01:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 6de4df23e4 | 🐛 fixed integer overflow in dump function #1447 Closes #1447. | 2019-01-20 12:26:01 +01:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | e17e0d031f | Merge pull request #1446 from scinart/develop attempt to fix #1445, flush buffer in serializer::dump_escaped in UTF8_REJECT case. | 2019-01-20 12:18:02 +01:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | e36593e960 | 🔨 trying code from https://godbolt.org/z/-tLO1K | 2019-01-20 11:12:20 +01:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | d359fd3a8d | 🚧 trying nodiscard attribute #1433 | 2019-01-19 17:32:23 +01:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | b9a39b38bf | Merge pull request #1434 from pboettch/develop allow push_back() and pop_back() calls on json_pointer | 2019-01-19 17:07:36 +01:00 |  |