Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								21d23982ca 
								
							 
						 
						
							
							
								
								🐛  fix for  #656  
							
							... 
							
							
							
							A complete rewrite of the string escape function. It now provides codepoint-to-\uxxxx escaping. Invalid UTF-8 byte sequences are not escaped, but copied as-is. I haven’t spent much time optimizing the code - but the library now agrees with Python on every single Unicode character’s escaping (see file test/data/json_nlohmann_tests/all_unicode_ascii.json).
Other minor changes: replaced "size_t" by "std::size_t" 
							
						 
						
							2017-07-17 07:53:02 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Ryan Mulder 
								
							 
						 
						
							
							
							
							
								
							
							
								71597be294 
								
							 
						 
						
							
							
								
								add ensure_ascii parameter to dump.  #330  
							
							
							
						 
						
							2017-07-11 13:48:08 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Théo DELRIEU 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								acff23efb2 
								
							 
						 
						
							
							
								
								move binary_{reader,writer} outside of basic_json  
							
							
							
						 
						
							2017-07-09 21:30:33 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Théo DELRIEU 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								15625ca4a7 
								
							 
						 
						
							
							
								
								move input adapters outside of basic_json  
							
							
							
						 
						
							2017-07-09 21:21:12 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Oleg Endo 
								
							 
						 
						
							
							
							
							
								
							
							
								f0ca96d462 
								
							 
						 
						
							
							
								
								include <iosfwd> instead of <iostream>  
							
							... 
							
							
							
							avoid bloat caused by <iostream> and std::cout and friends in apps where
iostream are not used. 
							
						 
						
							2017-07-09 15:04:49 +09:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								87bccbc335 
								
							 
						 
						
							
							
								
								🔨  removed exception parse_error.111  
							
							... 
							
							
							
							It makes no sense to have this special exception. Instead of throwing when an input adapter is created, it is better to detect a parse error in later usage when an EOF is "read" unexpectedly. 
							
						 
						
							2017-07-08 21:35:13 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ac42333749 
								
							 
						 
						
							
							
								
								⬆️  Catch v1.9.6  
							
							
							
						 
						
							2017-07-08 12:11:45 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								015c88783e 
								
							 
						 
						
							
							
								
								🔨  fixed a pedantic warning  
							
							
							
						 
						
							2017-07-08 12:03:12 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								63ecbfd36b 
								
							 
						 
						
							
							
								
								✅  re-added test  
							
							... 
							
							
							
							I have no idea why this test has been removed in the first place. 
							
						 
						
							2017-07-07 23:38:04 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8b123107c0 
								
							 
						 
						
							
							
								
								🔨  fixed some pedantic GCC warnings  
							
							
							
						 
						
							2017-07-07 22:41:22 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e99b783def 
								
							 
						 
						
							
							
								
								🔨  simplifying scanner  
							
							
							
						 
						
							2017-06-22 16:40:15 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4b5433578a 
								
							 
						 
						
							
							
								
								✅  added progress output for Unicode tests  
							
							... 
							
							
							
							Travis aborts tests if they do not produce output for 10 minutes. This commit shall fix this. 
							
						 
						
							2017-06-21 18:50:11 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6f3bebff5c 
								
							 
						 
						
							
							
								
								🔨  removed unexpect function  
							
							
							
						 
						
							2017-06-21 07:26:50 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e7695306f1 
								
							 
						 
						
							
							
								
								🔨  fixed a warning  
							
							
							
						 
						
							2017-06-20 22:58:02 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								84f2e64a7c 
								
							 
						 
						
							
							
								
								✅  improved coverage  
							
							
							
						 
						
							2017-06-20 22:35:31 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2f007ca092 
								
							 
						 
						
							
							
								
								✅  improved coverage  
							
							
							
						 
						
							2017-06-20 22:03:36 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7c2a187258 
								
							 
						 
						
							
							
								
								✅  improved test coverage  
							
							
							
						 
						
							2017-06-20 21:09:26 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e191dd833f 
								
							 
						 
						
							
							
								
								🔨  fixed warning about pointer members  
							
							
							
						 
						
							2017-06-20 21:09:05 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								82b95ca664 
								
							 
						 
						
							
							
								
								🔨  simplified error handling in parser  
							
							
							
						 
						
							2017-06-20 20:14:18 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f2cdb3d594 
								
							 
						 
						
							
							
								
								⬆️  Catch v1.9.5  
							
							
							
						 
						
							2017-06-20 20:13:56 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
							
							
								
							
							
								4e6f548c0b 
								
							 
						 
						
							
							
								
								Merge pull request  #624  from theodelrieu/feature/pair_tuple_conversions  
							
							... 
							
							
							
							add pair/tuple conversions 
							
						 
						
							2017-06-19 17:31:10 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Théo DELRIEU 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								08d781058c 
								
							 
						 
						
							
							
								
								add from_json support for std::array  
							
							
							
						 
						
							2017-06-19 12:03:38 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Théo DELRIEU 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6e4910d5c5 
								
							 
						 
						
							
							
								
								add pair/tuple conversions  
							
							
							
						 
						
							2017-06-19 10:16:37 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								112a6f4e53 
								
							 
						 
						
							
							
								
								🔨  replaced lexer's error message by const char*  
							
							
							
						 
						
							2017-06-18 13:03:14 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1fbb82de89 
								
							 
						 
						
							
							
								
								🔨  using std::array to buffer input  
							
							
							
						 
						
							2017-06-17 20:47:53 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								889006f006 
								
							 
						 
						
							
							
								
								✅  regression test for  #600  
							
							
							
						 
						
							2017-06-17 13:37:04 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b27d2adcbe 
								
							 
						 
						
							
							
								
								✨  accept functions to check if input is valid JSON  #458  
							
							
							
						 
						
							2017-06-16 19:23:55 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Théo DELRIEU 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c98364834f 
								
							 
						 
						
							
							
								
								remove std::pair support  
							
							
							
						 
						
							2017-06-13 11:11:29 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								afb959a083 
								
							 
						 
						
							
							
								
								🔨  removed nonportable code  
							
							
							
						 
						
							2017-06-12 19:02:08 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ac793e957f 
								
							 
						 
						
							
							
								
								🔨  trying to  fix   #367  
							
							... 
							
							
							
							Code from https://stackoverflow.com/a/44503794/266378  which is hopefully working with MSVC. 
							
						 
						
							2017-06-12 18:58:58 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									HenryLee 
								
							 
						 
						
							
							
							
							
								
							
							
								e12c2ee6a8 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into iterator_arithmetic  
							
							
							
						 
						
							2017-06-09 20:47:42 +10:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
							
							
								
							
							
								52f934cbbf 
								
							 
						 
						
							
							
								
								Merge pull request  #609  from theodelrieu/develop  
							
							... 
							
							
							
							Add pair support, fix CompatibleObject conversions (fixes  #600 ) 
							
						 
						
							2017-06-07 16:38:23 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Théo DELRIEU 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								cea39dfaa8 
								
							 
						 
						
							
							
								
								fix   #600  
							
							... 
							
							
							
							Instead of calling CompatibleObjectType iterator-range constructor,
first convert json::value_type to CompatibleObjectType::value_type 
							
						 
						
							2017-06-07 10:24:59 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									HenryLee 
								
							 
						 
						
							
							
							
							
								
							
							
								6661ec755b 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into iterator_arithmetic  
							
							
							
						 
						
							2017-06-07 18:01:46 +10:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									HenryLee 
								
							 
						 
						
							
							
							
							
								
							
							
								0f065edff6 
								
							 
						 
						
							
							
								
								Revert a change in reverse iterator to pass the test cases  
							
							
							
						 
						
							2017-06-07 18:01:01 +10:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								92ef19696a 
								
							 
						 
						
							
							
								
								✏️  cleanup after  #598  
							
							
							
						 
						
							2017-06-06 20:48:11 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Théo DELRIEU 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								85de93ba93 
								
							 
						 
						
							
							
								
								add std::pair<CompatibleStringType, T> support  
							
							
							
						 
						
							2017-06-06 13:56:16 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									HenryLee 
								
							 
						 
						
							
							
							
							
								
							
							
								fb91aa81da 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into iterator_arithmetic  
							
							
							
						 
						
							2017-06-05 20:24:21 +10:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									HenryLee 
								
							 
						 
						
							
							
							
							
								
							
							
								2ba554e442 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue550  
							
							
							
						 
						
							2017-06-05 20:24:08 +10:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d19c5ced4b 
								
							 
						 
						
							
							
								
								🐛  skipping BOM for iterators  #602  
							
							... 
							
							
							
							I totally forgot about byte order marks in this scenario. 
							
						 
						
							2017-06-02 12:38:32 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c043ba6978 
								
							 
						 
						
							
							
								
								🔥  removed failing test  #529  
							
							
							
						 
						
							2017-06-01 07:32:39 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									HenryLee 
								
							 
						 
						
							
							
							
							
								
							
							
								f2e1643039 
								
							 
						 
						
							
							
								
								Add test cases for iterator to const iterator assignment  
							
							
							
						 
						
							2017-05-31 00:50:40 +10:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									HenryLee 
								
							 
						 
						
							
							
							
							
								
							
							
								c09a4cbbd7 
								
							 
						 
						
							
							
								
								Add test cases for iterator to const iterator conversion  
							
							
							
						 
						
							2017-05-31 00:31:16 +10:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									HenryLee 
								
							 
						 
						
							
							
							
							
								
							
							
								0c2ed00ebe 
								
							 
						 
						
							
							
								
								Add missing test cases for n + it arithmetic in iterators  
							
							
							
						 
						
							2017-05-29 22:39:27 +10:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									HenryLee 
								
							 
						 
						
							
							
							
							
								
							
							
								5b245dae06 
								
							 
						 
						
							
							
								
								Comment out the exception message check in operator[] of reverse iterator  
							
							
							
						 
						
							2017-05-29 22:19:10 +10:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									HenryLee 
								
							 
						 
						
							
							
							
							
								
							
							
								a3bf0131c4 
								
							 
						 
						
							
							
								
								Fix some more reverse iterator arithmetic test codes  
							
							
							
						 
						
							2017-05-29 19:43:45 +10:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									HenryLee 
								
							 
						 
						
							
							
							
							
								
							
							
								adc73d6d5f 
								
							 
						 
						
							
							
								
								Fix the arithmetic mistakes in reverse iterator  
							
							
							
						 
						
							2017-05-29 18:52:53 +10:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									HenryLee 
								
							 
						 
						
							
							
							
							
								
							
							
								ed62129f8e 
								
							 
						 
						
							
							
								
								Override n + iterator operator in the iterator  
							
							
							
						 
						
							2017-05-27 13:44:14 +10:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								52adf3fd5b 
								
							 
						 
						
							
							
								
								🔨  fixed compilation  
							
							
							
						 
						
							2017-05-22 22:59:57 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9a576fe1d9 
								
							 
						 
						
							
							
								
								✅  added test for  #367  
							
							
							
						 
						
							2017-05-22 22:49:39 +02:00