Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ce53537ba2 
								
							 
						 
						
							
							
								
								➖   ➕  replaces amalgamation tool  
							
							... 
							
							
							
							The tool used before created a lot of duplicates inside the generated amalgamation. The new tool is a single Python file which seems to do the same job. 
							
						 
						
							2018-01-09 23:15:06 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0a2920e0fd 
								
							 
						 
						
							
							
								
								♻️  reorganized code  
							
							
							
						 
						
							2018-01-09 18:30:02 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b67e00b9b5 
								
							 
						 
						
							
							
								
								Merge pull request  #700  from theodelrieu/refactor/split_it  
							
							... 
							
							
							
							Refactor/split it 
							
						 
						
							2018-01-09 07:57:01 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								fd04967676 
								
							 
						 
						
							
							
								
								🐛  fixed copy-paste error  
							
							
							
						 
						
							2018-01-08 21:37:51 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								fb1154c237 
								
							 
						 
						
							
							
								
								🚧  debug  
							
							
							
						 
						
							2018-01-08 21:26:41 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								97e0d20ce9 
								
							 
						 
						
							
							
								
								🚧  debug  
							
							
							
						 
						
							2018-01-08 21:16:20 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ebf28a26ee 
								
							 
						 
						
							
							
								
								🚧  another try  
							
							
							
						 
						
							2018-01-08 20:49:02 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Théo DELRIEU 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7e4ee23f40 
								
							 
						 
						
							
							
								
								add single_header CMake target  
							
							
							
						 
						
							2018-01-08 20:09:43 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Théo DELRIEU 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								57d822b6e2 
								
							 
						 
						
							
							
								
								add missing includes, put back include comments  
							
							
							
						 
						
							2018-01-08 20:09:41 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Théo DELRIEU 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9cab30cfce 
								
							 
						 
						
							
							
								
								add adl_serializer.hpp  
							
							
							
						 
						
							2018-01-08 20:09:38 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Théo DELRIEU 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8e9714fe3d 
								
							 
						 
						
							
							
								
								add detail/json_ref.hpp  
							
							
							
						 
						
							2018-01-08 20:09:35 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Théo DELRIEU 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a3473fda6a 
								
							 
						 
						
							
							
								
								add detail/serializer.hpp  
							
							
							
						 
						
							2018-01-08 20:09:33 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Théo DELRIEU 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c117515e31 
								
							 
						 
						
							
							
								
								add detail/parsing/binary_writer.hpp  
							
							
							
						 
						
							2018-01-08 20:09:29 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Théo DELRIEU 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d620f76f0d 
								
							 
						 
						
							
							
								
								add detail/parsing/binary_reader.hpp  
							
							
							
						 
						
							2018-01-08 20:09:27 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Théo DELRIEU 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4dbb433a79 
								
							 
						 
						
							
							
								
								add detail/parsing/output_adapters.hpp  
							
							
							
						 
						
							2018-01-08 20:09:24 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Théo DELRIEU 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ae6f66048c 
								
							 
						 
						
							
							
								
								add detail/iterators/json_reverse_iterator.hpp  
							
							
							
						 
						
							2018-01-08 20:09:21 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Théo DELRIEU 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5fc9ef2b90 
								
							 
						 
						
							
							
								
								add detail/iterators/iteration_proxy.hpp  
							
							
							
						 
						
							2018-01-08 20:09:18 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Théo DELRIEU 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								bf06cf6c22 
								
							 
						 
						
							
							
								
								add detail/iterators/iter_impl.hpp  
							
							
							
						 
						
							2018-01-08 20:09:15 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Théo DELRIEU 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3e65a65290 
								
							 
						 
						
							
							
								
								add detail/iterators/internal_iterator.hpp  
							
							
							
						 
						
							2018-01-08 20:09:13 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Théo DELRIEU 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								51ecc31db7 
								
							 
						 
						
							
							
								
								add detail/iterators/primitive_iterator.hpp  
							
							
							
						 
						
							2018-01-08 20:09:10 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Théo DELRIEU 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9ea25685a8 
								
							 
						 
						
							
							
								
								add detail/parsing/parser.hpp  
							
							
							
						 
						
							2018-01-08 20:09:06 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Théo DELRIEU 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3a0743db97 
								
							 
						 
						
							
							
								
								add detail/parsing/lexer.hpp  
							
							
							
						 
						
							2018-01-08 20:09:04 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Théo DELRIEU 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7ab3e8d7b3 
								
							 
						 
						
							
							
								
								add detail/parsing/input_adapters.hpp  
							
							
							
						 
						
							2018-01-08 20:09:01 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Théo DELRIEU 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								21881606f2 
								
							 
						 
						
							
							
								
								add detail/conversions/to_json.hpp  
							
							
							
						 
						
							2018-01-08 20:08:58 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Théo DELRIEU 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e0c02c14f0 
								
							 
						 
						
							
							
								
								add detail/conversions/from_json.hpp  
							
							
							
						 
						
							2018-01-08 20:08:55 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Théo DELRIEU 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7056b375c4 
								
							 
						 
						
							
							
								
								add detail/value_t.hpp  
							
							
							
						 
						
							2018-01-08 20:08:52 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Théo DELRIEU 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8c555db970 
								
							 
						 
						
							
							
								
								add detail/exceptions.hpp  
							
							
							
						 
						
							2018-01-08 20:08:50 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Théo DELRIEU 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f364f5ac5a 
								
							 
						 
						
							
							
								
								add detail/meta.hpp  
							
							
							
						 
						
							2018-01-08 20:08:47 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Théo DELRIEU 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d686713f91 
								
							 
						 
						
							
							
								
								add detail/macro_{un}scope.hpp  
							
							
							
						 
						
							2018-01-08 20:08:44 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Théo DELRIEU 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5bffc95773 
								
							 
						 
						
							
							
								
								add json_fwd.hpp  
							
							
							
						 
						
							2018-01-08 20:08:38 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3d7658da89 
								
							 
						 
						
							
							
								
								🚧  working on AppVeyor's errors  
							
							
							
						 
						
							2018-01-08 19:48:18 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								126ce2e56c 
								
							 
						 
						
							
							
								
								🚧  further UBJSON  
							
							
							
						 
						
							2018-01-08 18:54:17 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c9938ea838 
								
							 
						 
						
							
							
								
								🚧  started UBJSON implementation  
							
							
							
						 
						
							2018-01-07 22:09:12 +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 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								96b40b27a5 
								
							 
						 
						
							
							
								
								📝  fixed Doxygen warnings  
							
							... 
							
							
							
							Apparently, using "\n" inside an alias is an error now, but "^^" basically means the same. 
							
						 
						
							2018-01-05 18:33:42 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								337e9824ea 
								
							 
						 
						
							
							
								
								Merge pull request  #900  from Dobiasd/patch-1  
							
							... 
							
							
							
							fix link to the documentation of the emplace function 
							
						 
						
							2018-01-04 17:11:18 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Tobias Hermann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ba2316372a 
								
							 
						 
						
							
							
								
								fix link to the documentation of the emplace function  
							
							
							
						 
						
							2018-01-03 11:06:32 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ce1dccf347 
								
							 
						 
						
							
							
								
								Merge branch 'release/3.0.1' into develop  
							
							
							
						 
						
							2017-12-29 20:24:49 +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 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3c76ff353d 
								
							 
						 
						
							
							
								
								📝  updated docs after PRs  
							
							
							
						 
						
							2017-12-29 16:52:09 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d45183d426 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of  https://github.com/nlohmann/json  into develop  
							
							
							
						 
						
							2017-12-28 13:52:26 +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 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f28fc2261a 
								
							 
						 
						
							
							
								
								Merge pull request  #858  from mattismyname/develop  
							
							... 
							
							
							
							🔧  Fix up a few more effc++ items 
						
							2017-12-28 12:13:19 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Matthew K. Gumbel 
								
							 
						 
						
							
							
							
							
								
							
							
								72bff90ed9 
								
							 
						 
						
							
							
								
								🔧  Fix up a few more effc++ items  
							
							
							
						 
						
							2017-12-24 10:03:36 -08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3113a52a7d 
								
							 
						 
						
							
							
								
								📝  added exception 403 to documentation of at ( #888 )  
							
							... 
							
							
							
							The at function throws json::out_of_range.403 when a nonexistent object key is provided (just like the usual at function). This was not documented and users could assume json::out_of_range.404 would be thrown instead.
- Updated documentation.
- Added example code. 
							
						 
						
							2017-12-23 18:38:18 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								184e9c6aa7 
								
							 
						 
						
							
							
								
								Merge pull request  #885  from TinyTinni/develop  
							
							... 
							
							
							
							Includes CTest module/adds BUILD_TESTING option 
							
						 
						
							2017-12-23 11:09:46 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Matthias Möller 
								
							 
						 
						
							
							
							
							
								
							
							
								d1cda6888e 
								
							 
						 
						
							
							
								
								includes CTest module resp. BUILD_TESTING option  
							
							
							
						 
						
							2017-12-20 17:54:45 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								88ddb12afc 
								
							 
						 
						
							
							
								
								📝  fix for  #883  
							
							... 
							
							
							
							- Adjusted table to user-defined exceptions. This was forgotten in the 3.0.0 update.
- Added update function to the table. 
							
						 
						
							2017-12-18 19:46:53 +01:00