Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9d27429527 
								
							 
						 
						
							
							
								
								🔨  added error messages to SAX interface  
							
							 
							
							
							
						 
						
							2018-03-05 16:46:35 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								86991d5204 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/sax2  
							
							 
							
							
							
						 
						
							2018-03-05 16:16:43 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8d104e6fe3 
								
							 
						 
						
							
							
								
								💚  fixed test case  
							
							 
							
							
							
						 
						
							2018-02-28 22:40:48 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5773e164bb 
								
							 
						 
						
							
							
								
								🚨  fixed a linter warning  
							
							 
							
							
							
						 
						
							2018-02-28 19:59:54 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Théo DELRIEU 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8711ec6034 
								
							 
						 
						
							
							
								
								support construction from other basic_json types  
							
							 
							
							... 
							
							
							
							Before this patch, `basic_json` types with different template arguments
were treated as `CompatibleArrayType`. Which sometimes leads to recursive
calls and stack overflows.
This patch adds a constructor and a `get` overload to deal with
different `basic_json` types. 
							
						 
						
							2018-02-27 16:48:09 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Théo DELRIEU 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c22f2d41f3 
								
							 
						 
						
							
							
								
								missing CHECK_NOTHROW in unit-udt  
							
							 
							
							
							
						 
						
							2018-02-27 11:09:53 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3ff9455332 
								
							 
						 
						
							
							
								
								🔨  added a SAX-DOM-Parser  
							
							 
							
							
							
						 
						
							2018-02-26 23:39:23 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								21352c4d8e 
								
							 
						 
						
							
							
								
								♻️  refactored SAX parser  
							
							 
							
							
							
						 
						
							2018-02-26 20:08:12 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8d6b3d44d6 
								
							 
						 
						
							
							
								
								👌  fixed some compiler warnings  
							
							 
							
							
							
						 
						
							2018-02-25 18:35:16 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8c7f46f7d0 
								
							 
						 
						
							
							
								
								🔨  removed a logic error and improved coverage  
							
							 
							
							
							
						 
						
							2018-02-25 17:10:30 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								922f7a3d0e 
								
							 
						 
						
							
							
								
								✅  added more tests for SAX parsing  
							
							 
							
							
							
						 
						
							2018-02-25 14:21:30 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ac230e8b4b 
								
							 
						 
						
							
							
								
								🔨  fixed test cases to be more robust  
							
							 
							
							
							
						 
						
							2018-02-25 10:44:47 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								374ebacc51 
								
							 
						 
						
							
							
								
								✨  added a SAX parser  #971  
							
							 
							
							
							
						 
						
							2018-02-24 18:04:07 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								938c861a09 
								
							 
						 
						
							
							
								
								🔖  set version to 3.1.1  
							
							 
							
							
							
						 
						
							2018-02-12 22:59:36 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								94b7a8da66 
								
							 
						 
						
							
							
								
								💄  fixed indentation  
							
							 
							
							
							
						 
						
							2018-02-12 20:46:14 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Théo DELRIEU 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								01d6118828 
								
							 
						 
						
							
							
								
								Fix constraints on from_json(CompatibleArrayType)  
							
							 
							
							... 
							
							
							
							Fixes  #924  
							
						 
						
							2018-02-12 15:37:33 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								74675dd69c 
								
							 
						 
						
							
							
								
								⏪  back to the original version  
							
							 
							
							
							
						 
						
							2018-02-09 22:40:52 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ab05df3a48 
								
							 
						 
						
							
							
								
								🔨  another try  
							
							 
							
							
							
						 
						
							2018-02-09 22:27:08 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0111f3187e 
								
							 
						 
						
							
							
								
								🔨  working on  #953  
							
							 
							
							
							
						 
						
							2018-02-09 21:30:15 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								83db7876c5 
								
							 
						 
						
							
							
								
								🏁  removing test case that fails on MSVC  #962  
							
							 
							
							
							
						 
						
							2018-02-09 18:32:12 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								33a9b00ce6 
								
							 
						 
						
							
							
								
								🐛  fix for  #962  
							
							 
							
							... 
							
							
							
							Added out_of_range exception for UBJSON containers with sizes that exceed the target container's max_size. 
							
						 
						
							2018-02-06 22:38:53 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8b457ace25 
								
							 
						 
						
							
							
								
								🐛  fixing CBOR's indefinity length strings  #961  
							
							 
							
							... 
							
							
							
							Beside the fix discussed in #961 , we also had to re-adjust a test case. It seems that it was failing before, and I "fixed" it to work with the broken implementation... 
							
						 
						
							2018-02-06 20:43:03 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								737cffe0cb 
								
							 
						 
						
							
							
								
								🔨  fixed directory for lcov coverage  
							
							 
							
							
							
						 
						
							2018-02-04 20:58:50 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0258484626 
								
							 
						 
						
							
							
								
								🔖  set version to 3.1.0  
							
							 
							
							... 
							
							
							
							- updated documentation wrt. new repository layout
- temporarily switched off Homebrew --HEAD building (can only be switched on after release)
- set copyright date to 2018 
							
						 
						
							2018-02-01 22:20:26 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Théo DELRIEU 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								14cd019861 
								
							 
						 
						
							
							
								
								fix cmake install directory (for real this time)  
							
							 
							
							... 
							
							
							
							* Rename 'develop' folder to 'include/nlohmann'
* Rename 'src' folder to 'single_include/nlohmann'
* Use <nlohmann/*> headers in sources and tests
* Change amalgamate config file 
							
						 
						
							2018-02-01 11:06:51 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								57e6fddd90 
								
							 
						 
						
							
							
								
								🚨  fixed warnings  
							
							 
							
							
							
						 
						
							2018-01-30 23:57:49 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								102c474397 
								
							 
						 
						
							
							
								
								🔨  clean up  
							
							 
							
							
							
						 
						
							2018-01-28 14:13:02 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								05f49fa401 
								
							 
						 
						
							
							
								
								✅  added roundtrip tests for UBJSON  
							
							 
							
							
							
						 
						
							2018-01-27 18:47:32 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f0b26c8f38 
								
							 
						 
						
							
							
								
								✅  added fuzzer for UBJSON input  
							
							 
							
							
							
						 
						
							2018-01-27 18:38:11 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b0a68f540f 
								
							 
						 
						
							
							
								
								✅  added roundtrip tests for UBJSON  
							
							 
							
							
							
						 
						
							2018-01-27 18:37:55 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								dbfd7e532b 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of  https://github.com/nlohmann/json  into develop  
							
							 
							
							
							
						 
						
							2018-01-23 16:33:10 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3c68a796df 
								
							 
						 
						
							
							
								
								🔥  deprecated iterator_wrapper  #874  
							
							 
							
							... 
							
							
							
							Also fixed some warnings from GCC. 
							
						 
						
							2018-01-23 16:33:08 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f5c4e9f3a1 
								
							 
						 
						
							
							
								
								Merge pull request  #919  from theodelrieu/fix/sfinae_for_incomplete_types  
							
							 
							
							... 
							
							
							
							fix sfinae on basic_json UDT constructor 
							
						 
						
							2018-01-23 07:32:06 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7eabb6ba36 
								
							 
						 
						
							
							
								
								📝  updated documentation for UBJSON functions  
							
							 
							
							
							
						 
						
							2018-01-22 23:23:17 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3cca630836 
								
							 
						 
						
							
							
								
								🔨  cleanup after  #915  
							
							 
							
							
							
						 
						
							2018-01-21 15:55:35 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								010e596001 
								
							 
						 
						
							
							
								
								Merge pull request  #915  from abolz/dtoa  
							
							 
							
							... 
							
							
							
							Floating-point formatting 
							
						 
						
							2018-01-21 15:02:57 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9e5d901f55 
								
							 
						 
						
							
							
								
								Merge branch 'feature/ubjson' into develop  
							
							 
							
							
							
						 
						
							2018-01-21 14:04:29 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a8f711a2f1 
								
							 
						 
						
							
							
								
								➕  using Google Benchmark  #921  
							
							 
							
							
							
						 
						
							2018-01-18 21:57:21 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Théo DELRIEU 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								dcee778c1e 
								
							 
						 
						
							
							
								
								fix sfinae on basic_json UDT constructor  
							
							 
							
							... 
							
							
							
							Avoid compiler errors when performing SFINAE checks on basic_json
and incomplete types. 
							
						 
						
							2018-01-17 12:17:38 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									abolz 
								
							 
						 
						
							
							
							
							
								
							
							
								787204f076 
								
							 
						 
						
							
							
								
								Add unit-tests for detail::to_chars  
							
							 
							
							
							
						 
						
							2018-01-15 21:13:17 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									abolz 
								
							 
						 
						
							
							
							
							
								
							
							
								0695ac4001 
								
							 
						 
						
							
							
								
								Add tests for  #360  
							
							 
							
							
							
						 
						
							2018-01-15 21:07:25 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									abolz 
								
							 
						 
						
							
							
							
							
								
							
							
								68a9736738 
								
							 
						 
						
							
							
								
								Tests: Re-enable some round-trip tests  
							
							 
							
							
							
						 
						
							2018-01-15 21:07:25 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									abolz 
								
							 
						 
						
							
							
							
							
								
							
							
								6e2e466c27 
								
							 
						 
						
							
							
								
								Tests: Don't rely on the format used for floating-point formatting  
							
							 
							
							
							
						 
						
							2018-01-15 21:07:25 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									abolz 
								
							 
						 
						
							
							
							
							
								
							
							
								107c21a488 
								
							 
						 
						
							
							
								
								Tests: Exponents are formatted with a leading '+' sign  
							
							 
							
							
							
						 
						
							2018-01-15 21:07:25 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									abolz 
								
							 
						 
						
							
							
							
							
								
							
							
								3ae82d91a2 
								
							 
						 
						
							
							
								
								Tests: Floating-point formatting uses lower case 'e'  
							
							 
							
							
							
						 
						
							2018-01-15 21:07:24 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								92f7295063 
								
							 
						 
						
							
							
								
								🔨  cleanup  
							
							 
							
							
							
						 
						
							2018-01-15 13:21:33 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9d6b3731b9 
								
							 
						 
						
							
							
								
								✅  improved test coverage  
							
							 
							
							
							
						 
						
							2018-01-14 20:07:38 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f85f4967fe 
								
							 
						 
						
							
							
								
								✅  improved test coverage  
							
							 
							
							
							
						 
						
							2018-01-14 17:22:06 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0e8f01a963 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/rfc7396  
							
							 
							
							
							
						 
						
							2018-01-14 10:28:09 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1b54d4a5aa 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/ubjson  
							
							 
							
							
							
						 
						
							2018-01-14 10:10:56 +01:00