Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								66d63abe6d 
								
							 
						 
						
							
							
								
								Update Makefile  
							
							
							
						 
						
							2019-07-28 18:40:11 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d4fd731f1f 
								
							 
						 
						
							
							
								
								🔨  fix release target  
							
							
							
						 
						
							2019-07-28 17:55:01 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7bf8a86090 
								
							 
						 
						
							
							
								
								🔨  adjust paths  
							
							
							
						 
						
							2019-07-28 14:30:17 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								90798caa62 
								
							 
						 
						
							
							
								
								🚚  rename Hedley macros  
							
							
							
						 
						
							2019-07-01 22:37:30 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								025f4cea42 
								
							 
						 
						
							
							
								
								🚨  fix warning  
							
							
							
						 
						
							2019-07-01 22:29:21 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								897362191d 
								
							 
						 
						
							
							
								
								🔨  add NLOHMANN_JSON prefix and undef macros  
							
							
							
						 
						
							2019-07-01 22:24:39 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								cf6b6692aa 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/fastcov  
							
							
							
						 
						
							2019-04-06 09:03:35 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f0bc16d899 
								
							 
						 
						
							
							
								
								🔨  overworked coverage targets  
							
							
							
						 
						
							2019-04-06 09:02:17 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e65cff2a8f 
								
							 
						 
						
							
							
								
								🔨  small cleanup  
							
							
							
						 
						
							2019-04-05 23:31:04 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								da279234d5 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/fastcov  
							
							
							
						 
						
							2019-04-04 09:03:11 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0da99027b7 
								
							 
						 
						
							
							
								
								🚨  silenced a warning  
							
							
							
						 
						
							2019-04-03 17:44:09 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1f03395e2c 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of  https://github.com/nlohmann/json  into develop  
							
							
							
						 
						
							2019-04-03 17:28:50 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2f9095ddab 
								
							 
						 
						
							
							
								
								🔨  relaxed requirements to coverage  
							
							
							
						 
						
							2019-04-03 17:28:47 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Viktor Kirilov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								64873fb5b8 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into doctest  
							
							
							
						 
						
							2019-03-30 23:23:33 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b12287b362 
								
							 
						 
						
							
							
								
								⚗️  trying fastcov  
							
							
							
						 
						
							2019-03-30 09:12:32 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c7878173f9 
								
							 
						 
						
							
							
								
								🔨  minor changes to maintainer targets  
							
							
							
						 
						
							2019-03-29 13:10:11 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								191aa0fd6f 
								
							 
						 
						
							
							
								
								🔧  overworked maintaner targets  
							
							
							
						 
						
							2019-03-28 14:22:48 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									onqtam 
								
							 
						 
						
							
							
							
							
								
							
							
								b4def6dcba 
								
							 
						 
						
							
							
								
								tabs instead of spaces...  
							
							
							
						 
						
							2019-03-27 01:13:10 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									onqtam 
								
							 
						 
						
							
							
							
							
								
							
							
								5d511a6e96 
								
							 
						 
						
							
							
								
								fixed a bunch of warnings from the Makefile from the root of the repo  
							
							
							
						 
						
							2019-03-27 00:58:53 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									onqtam 
								
							 
						 
						
							
							
							
							
								
							
							
								2b346099df 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of  https://github.com/nlohmann/json  into doctest  
							
							
							
						 
						
							2019-03-24 17:21:44 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b224c52376 
								
							 
						 
						
							
							
								
								🎨  cleanup  
							
							
							
						 
						
							2019-03-19 09:17:14 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Viktor Kirilov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								365944b0bc 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into doctest  
							
							
							
						 
						
							2019-03-18 16:59:36 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9fc093c9e0 
								
							 
						 
						
							
							
								
								👷  added targets for infer and oclint  
							
							
							
						 
						
							2019-03-18 00:19:28 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								df0f7f2b5d 
								
							 
						 
						
							
							
								
								👷  overworked clang-tidy target  
							
							
							
						 
						
							2019-03-17 12:02:23 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d6c4cd3b6d 
								
							 
						 
						
							
							
								
								🚨  adding targets for static analyzers  
							
							
							
						 
						
							2019-03-17 00:30:08 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								546e2cbf5e 
								
							 
						 
						
							
							
								
								🚨  fixed some warnings  
							
							
							
						 
						
							2019-03-13 22:14:53 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									onqtam 
								
							 
						 
						
							
							
							
							
								
							
							
								2f44ac1def 
								
							 
						 
						
							
							
								
								moved from Catch to doctest for unit tests  
							
							
							
						 
						
							2019-01-15 22:02:16 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5c04cc1009 
								
							 
						 
						
							
							
								
								🔨  fixed includes  
							
							
							
						 
						
							2019-01-13 15:31:22 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6f89613acd 
								
							 
						 
						
							
							
								
								🚨  fixed some warnings  
							
							
							
						 
						
							2018-12-23 13:56:18 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e2c5913a50 
								
							 
						 
						
							
							
								
								🚧  some changes to the BSON code  
							
							... 
							
							
							
							- added fuzz testers
- added some reference files
- made an exception text more clear 
							
						 
						
							2018-10-24 15:43:37 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								011b15dd08 
								
							 
						 
						
							
							
								
								♿  added line positions to error messages  
							
							... 
							
							
							
							This is a follow-up to #1210 . 
							
						 
						
							2018-10-07 12:27:24 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								eb30ff0615 
								
							 
						 
						
							
							
								
								🚨  fixed a compiler warning  #1224  
							
							
							
						 
						
							2018-09-06 07:25:19 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3811daa8a3 
								
							 
						 
						
							
							
								
								📝  release preparation  
							
							
							
						 
						
							2018-08-18 12:00:14 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Théo DELRIEU 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f6febbe359 
								
							 
						 
						
							
							
								
								split meta.hpp, add detected_t (used to define concepts)  
							
							
							
						 
						
							2018-08-16 11:58:42 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								99ecca55c4 
								
							 
						 
						
							
							
								
								✅  improved test coverage  
							
							
							
						 
						
							2018-03-20 18:49:10 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								86991d5204 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/sax2  
							
							
							
						 
						
							2018-03-05 16:16:43 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5773e164bb 
								
							 
						 
						
							
							
								
								🚨  fixed a linter warning  
							
							
							
						 
						
							2018-02-28 19:59:54 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								21352c4d8e 
								
							 
						 
						
							
							
								
								♻️  refactored SAX parser  
							
							
							
						 
						
							2018-02-26 20:08:12 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								447f5421eb 
								
							 
						 
						
							
							
								
								🔨  overworked release target  
							
							
							
						 
						
							2018-02-11 16:50:01 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								548f488941 
								
							 
						 
						
							
							
								
								🔨  overworked Makefile  
							
							
							
						 
						
							2018-02-10 14:46:39 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0111f3187e 
								
							 
						 
						
							
							
								
								🔨  working on  #953  
							
							
							
						 
						
							2018-02-09 21:30:15 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2b7b39c72d 
								
							 
						 
						
							
							
								
								🚀  added release target  #956  
							
							
							
						 
						
							2018-02-04 13:29:23 +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 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1483d39c91 
								
							 
						 
						
							
							
								
								🔨  moved class json_pointer into separate file  #920  
							
							
							
						 
						
							2018-01-28 15:36:56 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6855bbb902 
								
							 
						 
						
							
							
								
								🔨  split "parsing" directory to "input" and "output"  
							
							
							
						 
						
							2018-01-28 13:15:03 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f0b26c8f38 
								
							 
						 
						
							
							
								
								✅  added fuzzer for UBJSON input  
							
							
							
						 
						
							2018-01-27 18:38:11 +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 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3cca630836 
								
							 
						 
						
							
							
								
								🔨  cleanup after  #915  
							
							
							
						 
						
							2018-01-21 15:55:35 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3ac674562f 
								
							 
						 
						
							
							
								
								🔨  clean up  
							
							
							
						 
						
							2018-01-14 22:26:20 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d9446b0e6e 
								
							 
						 
						
							
							
								
								Merge pull request  #911  from theodelrieu/fix/cmake_install  
							
							... 
							
							
							
							Fix/cmake install 
							
						 
						
							2018-01-14 20:08:49 +01:00