| 
								
								
									 Niels Lohmann | 1be63431f3 | ✨ make emplace_back return a reference #1609 | 2019-06-30 12:19:41 +02:00 |  | 
				
					
						| 
								
								
									 Isaac Nickaein | 0a137b78ac | Appveyor: Set timeout of unit-tests in appveyor.yml instead of CMake | 2019-06-22 22:14:40 +04:30 |  | 
				
					
						| 
								
								
									 Isaac Nickaein | eba8244ead | Avoid collision of ::max with windows.h macro | 2019-06-22 21:15:13 +04:30 |  | 
				
					
						| 
								
								
									 Isaac Nickaein | 4ac0fe2628 | Increase timeout of test-unicode_all in Debug build | 2019-06-22 21:15:03 +04:30 |  | 
				
					
						| 
								
								
									 Taylor Howard | 2f389cdde7 | Added explicit converstion to std::string_view. Fixes failing test with GCC 8.3 | 2019-06-16 14:49:01 +10:00 |  | 
				
					
						| 
								
								
									 Macr0Nerd | aa4c45ee4d | Added to_string (with ugly macro) and tests | 2019-04-26 18:10:45 -05:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | cf6b6692aa | Merge branch 'develop' into feature/fastcov | 2019-04-06 09:03:35 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | f0bc16d899 | 🔨 overworked coverage targets | 2019-04-06 09:02:17 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | b4b06d89b5 | ⬆️ updated fastcov | 2019-04-06 00:24:19 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | e65cff2a8f | 🔨 small cleanup | 2019-04-05 23:31:04 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 0a1ddd6882 | ⬆️ updated fastcov | 2019-04-05 07:54:46 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 4676f759e8 | ⬆️ updated fastcov | 2019-04-04 09:50:27 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | da279234d5 | Merge branch 'develop' into feature/fastcov | 2019-04-04 09:03:11 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | f05614b240 | 🏗️ adding anonymous namespace | 2019-04-04 08:56:36 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 1f03395e2c | Merge branch 'develop' of https://github.com/nlohmann/json into develop | 2019-04-03 17:28:50 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 2f9095ddab | 🔨 relaxed requirements to coverage | 2019-04-03 17:28:47 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | ee8732c359 | Merge pull request #1555 from theodelrieu/fix/1511 Fix/1511 | 2019-04-03 17:24:25 +02:00 |  | 
				
					
						| 
								
								
									 Théo DELRIEU | d66abda4ee | tests: fix coverage | 2019-04-03 12:34:15 +02: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 |  | 
				
					
						| 
								
								
									 onqtam | da5b7833a0 | fixing the remaining of the pedantic gcc/clang target warnings | 2019-03-31 13:57:44 +03:00 |  | 
				
					
						| 
								
								
									 Viktor Kirilov | 64873fb5b8 | Merge branch 'develop' into doctest | 2019-03-30 23:23:33 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 53001414c7 | 🔨 using --exclude-gcov to exclude files | 2019-03-30 17:00:30 +01:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | b12287b362 | ⚗️ trying fastcov | 2019-03-30 09:12:32 +01:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | b21c04c938 | 🔥 removed unsupported flag | 2019-03-29 17:34:58 +01:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 191aa0fd6f | 🔧 overworked maintaner targets | 2019-03-28 14:22:48 +01:00 |  | 
				
					
						| 
								
								
									 onqtam | a0000c3235 | finished the last of the warnings | 2019-03-27 01:09:47 +02:00 |  | 
				
					
						| 
								
								
									 onqtam | 5d511a6e96 | fixed a bunch of warnings from the Makefile from the root of the repo | 2019-03-27 00:58:53 +02:00 |  | 
				
					
						| 
								
								
									 onqtam | 0caf986505 | reverted the removal of this if/else branching - this is the easiest way to get -std=c++0x support | 2019-03-25 22:04:37 +02:00 |  | 
				
					
						| 
								
								
									 onqtam | ff51a32be1 | updated doctest to version 2.3.1 released today | 2019-03-24 17:28:52 +02:00 |  | 
				
					
						| 
								
								
									 onqtam | 2b346099df | Merge branch 'develop' of https://github.com/nlohmann/json into doctest | 2019-03-24 17:21:44 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | baaa2a4d0f | 🏁 trying to use constructors from std::allocator #1536 | 2019-03-21 14:09:29 +01:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | efa1b9a7bb | 🔖 set version to 3.6.1 | 2019-03-20 20:50:05 +01:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | b37392b7ac | 🔖 set version to 3.6.0 | 2019-03-20 00:19:07 +01:00 |  | 
				
					
						| 
								
								
									 Viktor Kirilov | 155d196bfa | Update CMakeLists.txt | 2019-03-18 17:58:35 +02:00 |  | 
				
					
						| 
								
								
									 Viktor Kirilov | 365944b0bc | Merge branch 'develop' into doctest | 2019-03-18 16:59:36 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | b8451c236f | 🚨 fixed warnings | 2019-03-17 12:01:49 +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 | cabe2357b8 | Merge pull request #1492 from stac47/fix_gcc9_allocator Fix gcc9 build error test/src/unit-allocator.cpp (Issue #1472) | 2019-03-11 15:21:54 +01:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 8eb7db7277 | Merge pull request #1441 from iwanders/support-cmake-older-than-3-8-with-if Use C++11 features supported by CMake 3.1. | 2019-03-10 22:08:16 +01: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 | d183bd0456 | Tests for json_pointer::empty and json_pointer::parent_pointer | 2019-02-25 09:26:08 +00:00 |  | 
				
					
						| 
								
								
									 Laurent Stacul | ddc9f201f4 | Fix gcc9 build error test/src/unit-allocator.cpp (Issue #1472) | 2019-02-22 16:05:41 +00:00 |  | 
				
					
						| 
								
								
									 Isaac Nickaein | e93f305494 | Add unit-test for contains() member function | 2019-02-13 13:21:54 +03:30 |  | 
				
					
						| 
								
								
									 garethsb-sony | 5da757bbb3 | Attempt to satisfy Coveralls by adding a test for (unchanged) operator std::string | 2019-01-31 23:39:57 +00:00 |  | 
				
					
						| 
								
								
									 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 |  |