Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0e8f01a963 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/rfc7396  
							
							
							
						 
						
							2018-01-14 10:28:09 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Théo DELRIEU 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7e4ee23f40 
								
							 
						 
						
							
							
								
								add single_header CMake target  
							
							
							
						 
						
							2018-01-08 20:09:43 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								15b6421d07 
								
							 
						 
						
							
							
								
								✅  added UTF-8 decoder capability and stress test  
							
							... 
							
							
							
							As described in http://www.cl.cam.ac.uk/~mgk25/ucs/examples/UTF-8-test.txt ; Markus Kuhn <http://www.cl.cam.ac.uk/~mgk25/ > - 2015-08-28 - CC BY 4.0 
							
						 
						
							2018-01-05 23:26:22 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								78f8f837e6 
								
							 
						 
						
							
							
								
								added items() function  #874  
							
							
							
						 
						
							2018-01-05 18:34:10 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								92484f0caf 
								
							 
						 
						
							
							
								
								🔖  set version to 3.0.1  
							
							
							
						 
						
							2017-12-29 18:31:13 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ebc6849b71 
								
							 
						 
						
							
							
								
								✅  added test for  #894  
							
							
							
						 
						
							2017-12-29 16:53:04 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3b3b6e8e69 
								
							 
						 
						
							
							
								
								🚑  fix for  #894  
							
							... 
							
							
							
							- Implemented "copy" in terms of "add".
- Added check for JSON Pointer array indices to make sure the complete reference token was processed.
- Added test suite from https://github.com/json-patch/json-patch-tests  
							
						 
						
							2017-12-28 13:52:23 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9e3c4ad11f 
								
							 
						 
						
							
							
								
								🔖  set version to 3.0.0  
							
							
							
						 
						
							2017-12-17 08:31:18 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9a51fb4da2 
								
							 
						 
						
							
							
								
								🚨  fixed some warnings  
							
							
							
						 
						
							2017-12-16 22:19:30 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4c871c58f8 
								
							 
						 
						
							
							
								
								✅  re-added tests for algorithms  
							
							
							
						 
						
							2017-12-16 11:16:34 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c6e7eae394 
								
							 
						 
						
							
							
								
								✨  implemented JSON Merge Patch (RFC 7396)  
							
							... 
							
							
							
							SQLite's json1 extension (https://www.sqlite.org/json1.html ) supports JSON Merge Patch (https://tools.ietf.org/html/rfc7396 ). As the implementation is trivial and we already support JSON Patch, I think this could be a nice extension to the library. 
							
						 
						
							2017-12-13 23:36:22 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8419bfbbd2 
								
							 
						 
						
							
							
								
								✅  improved test coverage  
							
							... 
							
							
							
							As we guarantee proper UTF-8 before, we do not need to cope with it later. 
							
						 
						
							2017-12-12 20:44:57 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								569d275f65 
								
							 
						 
						
							
							
								
								💥  throwing an exception in case dump encounters a non-UTF-8 string  #838  
							
							... 
							
							
							
							We had a lot of issues with failing roundtrips (i.e., parse errors from serializations) in case string were stored in the library that were not UTF-8 encoded. This PR adds an exception in this case. 
							
						 
						
							2017-12-11 22:38:05 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								772bb3cc20 
								
							 
						 
						
							
							
								
								📝  fixing documentation  #867  
							
							... 
							
							
							
							The example in the documentation on how to "force" an array of arrays was wrong since the first release. Fixed the documentation and added checks for the README unit tests. 
							
						 
						
							2017-12-10 12:32:20 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Matthias Möller 
								
							 
						 
						
							
							
							
							
								
							
							
								5b4855dea2 
								
							 
						 
						
							
							
								
								fix targetname  
							
							
							
						 
						
							2017-11-26 10:29:51 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								430f03512c 
								
							 
						 
						
							
							
								
								🚨  fixed some warnings  #821  
							
							
							
						 
						
							2017-11-25 22:06:18 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								de75cf89f7 
								
							 
						 
						
							
							
								
								✅  improved test coverage  
							
							
							
						 
						
							2017-11-25 19:41:02 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5696660eba 
								
							 
						 
						
							
							
								
								🔨  another try to  fix   #714  
							
							... 
							
							
							
							adding std::ios_base::binary when opening all_unicode.json.cbor 
							
						 
						
							2017-10-31 15:04:14 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Théo DELRIEU 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4b46abf97c 
								
							 
						 
						
							
							
								
								add forwarding references to json_ref constructor  
							
							... 
							
							
							
							fixes  #805  
						
							2017-10-28 14:22:57 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								734e2b73cf 
								
							 
						 
						
							
							
								
								🔨  cleanup  
							
							
							
						 
						
							2017-10-27 11:49:24 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1b1bd0e3e6 
								
							 
						 
						
							
							
								
								⏪   #714  is still not fixed  
							
							
							
						 
						
							2017-10-23 12:01:50 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								89650c99dd 
								
							 
						 
						
							
							
								
								🚧  checking if  #714  is now fixed with MSVC  
							
							... 
							
							
							
							Hopefully, #764  fixed this. 
							
						 
						
							2017-10-22 11:16:33 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b0c380b0f8 
								
							 
						 
						
							
							
								
								📝  cleanup after the last PRs  
							
							
							
						 
						
							2017-10-22 09:12:35 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								be4fba7baf 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of  https://github.com/nlohmann/json  into develop  
							
							
							
						 
						
							2017-10-22 08:53:46 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								24b6e028a9 
								
							 
						 
						
							
							
								
								✅  improved test coverage  
							
							
							
						 
						
							2017-10-22 08:53:27 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
							
							
								
							
							
								ef40673acb 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into develop-simplify-istream  
							
							
							
						 
						
							2017-10-22 08:52:15 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Jamie Seward 
								
							 
						 
						
							
							
							
							
								
							
							
								a99fcb4e7d 
								
							 
						 
						
							
							
								
								Add comments and newline  
							
							
							
						 
						
							2017-10-17 22:53:35 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Jamie Seward 
								
							 
						 
						
							
							
							
							
								
							
							
								917d9d8bc3 
								
							 
						 
						
							
							
								
								Fix Visual Studio 2017 warnings  
							
							
							
						 
						
							2017-10-16 23:23:55 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Jamie Seward 
								
							 
						 
						
							
							
							
							
								
							
							
								af99090742 
								
							 
						 
						
							
							
								
								Disable warning C4389: '==': signed/unsigned mismatch  
							
							... 
							
							
							
							Lots of tests have this warning.
Also moved out of for loop, doesn't need to be done every loop. 
							
						 
						
							2017-10-16 01:02:48 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Jamie Seward 
								
							 
						 
						
							
							
							
							
								
							
							
								19f8f1c075 
								
							 
						 
						
							
							
								
								Add missing "u8"  
							
							... 
							
							
							
							This causes test-udt to crash due to bad iterator 
							
						 
						
							2017-10-16 00:21:38 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Jamie Seward 
								
							 
						 
						
							
							
							
							
								
							
							
								5ec44fe9e3 
								
							 
						 
						
							
							
								
								Add /W4 for MSVS  
							
							
							
						 
						
							2017-10-15 22:56:38 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Perry Kundert 
								
							 
						 
						
							
							
							
							
								
							
							
								546e148b24 
								
							 
						 
						
							
							
								
								Further performance improvements, and corrections in get_token_string  
							
							... 
							
							
							
							o An (-'ve valued, typically -1) EOF must never be allowed in
  token_string, as it be converted to 255 -- a legitimate value.
o Comparing against a specific eof() (-1, typically) is more costly than
  detecting +'ve/-'ve.  Since EOF is the only non-positive value allowed
  we can use the simpler test.
o Removed unnecessary test for token_string size, as it is already
  tested in the method, and must never occur in correct code; used an
  assert instead. 
							
						 
						
							2017-10-05 16:16:41 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Perry Kundert 
								
							 
						 
						
							
							
							
							
								
							
							
								f585fe4eec 
								
							 
						 
						
							
							
								
								Test to confirm parsing of multiple JSON records in a istream  #367  
							
							
							
						 
						
							2017-10-05 16:01:41 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								615366447a 
								
							 
						 
						
							
							
								
								🔧  removing -Weffc++ warnings  
							
							
							
						 
						
							2017-10-05 19:43:19 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								75f4678b96 
								
							 
						 
						
							
							
								
								🔨  added filter script for branch coverage  
							
							
							
						 
						
							2017-10-05 19:08:15 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c204ac82e0 
								
							 
						 
						
							
							
								
								🔨  adjusted Coverity script to work without Makefile  
							
							
							
						 
						
							2017-10-05 07:13:59 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1b3df3a63f 
								
							 
						 
						
							
							
								
								🔨  trying to use Coveralls with CMake  #698  
							
							
							
						 
						
							2017-10-04 22:18:21 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e2045eae53 
								
							 
						 
						
							
							
								
								🏁  and another try  
							
							
							
						 
						
							2017-10-03 18:47:08 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a85bc358f7 
								
							 
						 
						
							
							
								
								🏁  another try  
							
							
							
						 
						
							2017-10-03 18:21:40 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3457e7bc5b 
								
							 
						 
						
							
							
								
								🏁  try to get MSVC 2017 running again  
							
							
							
						 
						
							2017-10-03 17:57:40 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f89f8b2d0b 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/issue698  
							
							
							
						 
						
							2017-10-02 17:47:53 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8af49d4be5 
								
							 
						 
						
							
							
								
								🚨  removing compiler warnings  #755  
							
							
							
						 
						
							2017-09-30 11:00:26 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								647711fad1 
								
							 
						 
						
							
							
								
								✅  improved test coverage  
							
							
							
						 
						
							2017-09-14 17:31:28 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e75adc21a5 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/issue698  
							
							
							
						 
						
							2017-09-13 18:57:25 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b90529c36d 
								
							 
						 
						
							
							
								
								✅  improved test coverage  
							
							
							
						 
						
							2017-09-13 18:56:54 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								82c93680d1 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/issue698  
							
							
							
						 
						
							2017-09-10 22:38:23 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e2e0ecd867 
								
							 
						 
						
							
							
								
								✅  improved test coverage  
							
							
							
						 
						
							2017-09-10 22:38:04 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								248db1e423 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/issue698  
							
							
							
						 
						
							2017-09-10 11:42:57 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7410763731 
								
							 
						 
						
							
							
								
								✅  improved test coverage  
							
							
							
						 
						
							2017-09-10 11:42:43 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								cafc2d057a 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/issue698  
							
							
							
						 
						
							2017-09-10 10:22:10 +02:00