Vitaliy Manushkin 
								
							 
						 
						
							
							
							
							
								
							
							
								faccc37d0d 
								
							 
						 
						
							
							
								
								dump to alternate implementation of string, as defined in basic_json template  
							
							
							
						 
						
							2018-03-10 17:19:28 +03:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								149d2fd09c 
								
							 
						 
						
							
							
								
								💚  improved test coverage  
							
							
							
						 
						
							2018-03-10 11:24:00 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6399cd3039 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/sax2  
							
							
							
						 
						
							2018-03-10 11:07:36 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6151dfaed7 
								
							 
						 
						
							
							
								
								👌  made changes proposed in  #1001  
							
							
							
						 
						
							2018-03-10 11:02:58 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								35e43df625 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/sax2  
							
							
							
						 
						
							2018-03-09 21:56:30 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								aa8fc2a41c 
								
							 
						 
						
							
							
								
								🚑  hopefully fixed the memory leak  
							
							
							
						 
						
							2018-03-08 17:11:15 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								97559bb1b2 
								
							 
						 
						
							
							
								
								🔨  trying to fix the leak  
							
							... 
							
							
							
							Part 1: properly use forwarding 
							
						 
						
							2018-03-08 07:36:56 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8b379948d0 
								
							 
						 
						
							
							
								
								🔥  replaced acceptor with SAX parser  
							
							
							
						 
						
							2018-03-07 22:40:48 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								303a0c5843 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/sax2  
							
							
							
						 
						
							2018-03-07 22:26:01 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d2d65bb25b 
								
							 
						 
						
							
							
								
								♻️  refined SFINAE to fix some warnings  
							
							
							
						 
						
							2018-03-07 22:01:44 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								476b2e09be 
								
							 
						 
						
							
							
								
								💚  added regression tests for  #972  and  #977  
							
							
							
						 
						
							2018-03-06 20:13:31 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								62030615a0 
								
							 
						 
						
							
							
								
								Merge pull request  #986  from theodelrieu/fix/basic_json_conversion  
							
							... 
							
							
							
							Fix/basic json conversion 
							
						 
						
							2018-03-06 19:27:39 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5beab80553 
								
							 
						 
						
							
							
								
								🔨  using the SAX-DOM parser  
							
							
							
						 
						
							2018-03-06 18:17:07 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								faf2546a15 
								
							 
						 
						
							
							
								
								🔨  simplified SAX-DOM parser  
							
							
							
						 
						
							2018-03-06 07:19:05 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5b9d03cfdb 
								
							 
						 
						
							
							
								
								🔨  added SAX-DOM-Parser  
							
							
							
						 
						
							2018-03-05 21:06:00 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Mike Bogdanov 
								
							 
						 
						
							
							
							
							
								
							
							
								2a2ed799b1 
								
							 
						 
						
							
							
								
								pvs_studio fix. misprinted condition  
							
							
							
						 
						
							2018-03-02 11:12:44 +03: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 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								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 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Théo DELRIEU 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								01d6118828 
								
							 
						 
						
							
							
								
								Fix constraints on from_json(CompatibleArrayType)  
							
							... 
							
							
							
							Fixes  #924  
						
							2018-02-12 15:37:33 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								865ff00de0 
								
							 
						 
						
							
							
								
								📝  updated documentation wrt. objects  #963  
							
							
							
						 
						
							2018-02-09 23:37:20 +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 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								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