Julian Becker 
								
							 
						 
						
							
							
							
							
								
							
							
								6c447de076 
								
							 
						 
						
							
							
								
								BSON: Support objects with string members  
							
							
							
						 
						
							2018-09-15 11:33:24 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Julian Becker 
								
							 
						 
						
							
							
							
							
								
							
							
								0c0f2e44b5 
								
							 
						 
						
							
							
								
								BSON: support doubles  
							
							
							
						 
						
							2018-09-15 10:32:03 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Julian Becker 
								
							 
						 
						
							
							
							
							
								
							
							
								9a0dddc5d2 
								
							 
						 
						
							
							
								
								BSON: Object with single boolean  
							
							
							
						 
						
							2018-09-15 03:08:50 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Julian Becker 
								
							 
						 
						
							
							
							
							
								
							
							
								5f5836ce1c 
								
							 
						 
						
							
							
								
								BSON: Support empty objects  
							
							
							
						 
						
							2018-09-15 00:43:39 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Julian Becker 
								
							 
						 
						
							
							
							
							
								
							
							
								f06c8fd8e3 
								
							 
						 
						
							
							
								
								BSON: serialization of non-objects is not supported  
							
							
							
						 
						
							2018-09-15 00:20:03 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ebb3c03293 
								
							 
						 
						
							
							
								
								🎨  cleanup after  #1228  
							
							
							
						 
						
							2018-09-09 18:19:33 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Théo DELRIEU 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4b4bbceebf 
								
							 
						 
						
							
							
								
								make from_json SFINAE-correct  
							
							
							
						 
						
							2018-09-07 14:10:37 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Ben Berman 
								
							 
						 
						
							
							
							
							
								
							
							
								ad053ef09c 
								
							 
						 
						
							
							
								
								Fix tests for improved error 305(hopefully)  
							
							
							
						 
						
							2018-08-30 13:21:55 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9f3857ef6f 
								
							 
						 
						
							
							
								
								🔖  set version to 3.2.0  
							
							
							
						 
						
							2018-08-18 18:46:15 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5ad52f4167 
								
							 
						 
						
							
							
								
								⬆️  Catch 1.12.0  
							
							
							
						 
						
							2018-08-18 12:02:12 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								57faaf42ca 
								
							 
						 
						
							
							
								
								🚨  fixed a compiler warning  
							
							
							
						 
						
							2018-08-18 08:15:03 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e33b31e6aa 
								
							 
						 
						
							
							
								
								🐛  fixed callback-related issue ( https://github.com/nlohmann/json/issues/971#issuecomment-413678360 )  
							
							
							
						 
						
							2018-08-17 23:09:45 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								07494e06d7 
								
							 
						 
						
							
							
								
								🚨  fixed some compiler warnings  
							
							
							
						 
						
							2018-08-16 18:20:30 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Théo DELRIEU 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								38f8a51a8f 
								
							 
						 
						
							
							
								
								use abstract sax class in parser tests  
							
							
							
						 
						
							2018-08-16 11:59:49 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Théo DELRIEU 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9bbb133094 
								
							 
						 
						
							
							
								
								remove no_limit constant and default values  
							
							
							
						 
						
							2018-08-16 11:59:05 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Théo DELRIEU 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								442886d040 
								
							 
						 
						
							
							
								
								use templates in the sax interface instead of virtuals  
							
							
							
						 
						
							2018-08-16 11:58:52 +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 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								fed70f6bff 
								
							 
						 
						
							
							
								
								🎨  reindented code  
							
							
							
						 
						
							2018-08-14 22:11:08 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Gmelin 
								
							 
						 
						
							
							
							
							
								
							
							
								05b27e83b7 
								
							 
						 
						
							
							
								
								Exclude bytewise comparison in certain tests.  
							
							... 
							
							
							
							These tests never worked - they weren't run before
d5aaeb4 
							
						 
						
							2018-07-29 14:52:52 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Gmelin 
								
							 
						 
						
							
							
							
							
								
							
							
								d5aaeb4cce 
								
							 
						 
						
							
							
								
								Make section names unique in loops, as catch doesn't support duplicate  
							
							... 
							
							
							
							sections, see also https://github.com/catchorg/Catch2/issues/816#issuecomment-278268122 
As a result, when built with gcc, loop iterations were skipped. When
built with clang, the test aborted with an assertion in catch.hpp
line 6222.
This also addresses the issues discussed here:
https://github.com/nlohmann/json/issues/1032#issuecomment-378707696 
and here:
https://github.com/catchorg/Catch2/issues/1241 
Please note that this introduces new problems, as some of
the unit tests fail now - the library stores keys in
lexographical order, while the cbor/msgpack/ubjson examples
store them in original order. 
							
						 
						
							2018-07-29 10:44:36 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3760a38b7e 
								
							 
						 
						
							
							
								
								🏁  implicit conversion is not allowed with MSVC  
							
							
							
						 
						
							2018-07-21 11:47:05 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5b14411669 
								
							 
						 
						
							
							
								
								🏁  trying to fix C2440 error  
							
							... 
							
							
							
							Error in AppVeyor:
unit-conversions.cpp(441): error C2440: 'initializing': cannot convert from 'nlohmann::json' to 'std::nullptr_t'
(https://ci.appveyor.com/project/nlohmann/json/build/2838/job/wo7im01sq6tvhe9m ) 
							
						 
						
							2018-07-21 10:59:00 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								347e77bdc1 
								
							 
						 
						
							
							
								
								🚑  fix for  #1169  
							
							
							
						 
						
							2018-07-21 10:31:55 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Sonu Lohani 
								
							 
						 
						
							
							
							
							
								
							
							
								b8ad3388ec 
								
							 
						 
						
							
							
								
								Fixed compiler error in VS 2015 for debug mode  
							
							... 
							
							
							
							https://github.com/nlohmann/json/issues/1114  
						
							2018-06-29 09:34:41 +05:30 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								86a96b059d 
								
							 
						 
						
							
							
								
								Merge pull request  #1134  from Daniel599/feature/items_iterator  
							
							... 
							
							
							
							fixed compile error for #1045  
							
						 
						
							2018-06-28 21:21:17 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Julius Rakow 
								
							 
						 
						
							
							
							
							
								
							
							
								9f00db48d9 
								
							 
						 
						
							
							
								
								📝  link to cppreference via HTTPS  
							
							
							
						 
						
							2018-06-24 22:34:47 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								09c0df4a21 
								
							 
						 
						
							
							
								
								👷  choosing correct image  
							
							
							
						 
						
							2018-06-24 17:40:16 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d8fe13fc83 
								
							 
						 
						
							
							
								
								🔨  fixed escaping for MinGW  
							
							
							
						 
						
							2018-06-24 16:57:53 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7fa4ddf93e 
								
							 
						 
						
							
							
								
								💄  fixed indentation  
							
							
							
						 
						
							2018-06-23 17:27:40 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								bf348ca8a4 
								
							 
						 
						
							
							
								
								Merge pull request  #1028  from gracicot/develop  
							
							... 
							
							
							
							Added support for string_view in C++17 
							
						 
						
							2018-06-23 17:10:04 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								850922269d 
								
							 
						 
						
							
							
								
								🚨  removed compiler warnings  
							
							
							
						 
						
							2018-06-23 10:28:04 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e7c1638d11 
								
							 
						 
						
							
							
								
								💄  cleanup  
							
							
							
						 
						
							2018-06-18 22:03:46 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1c81e9f5ae 
								
							 
						 
						
							
							
								
								Merge pull request  #1130  from agrianius/develop  
							
							... 
							
							
							
							test (non)equality for alt_string implementation 
							
						 
						
							2018-06-18 22:01:53 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Théo DELRIEU 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2c920a1032 
								
							 
						 
						
							
							
								
								run make amalgamate  
							
							
							
						 
						
							2018-06-18 15:14:10 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Théo DELRIEU 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2b37d7ed86 
								
							 
						 
						
							
							
								
								from_json: add overload for std::unordered_map  
							
							... 
							
							
							
							Fixes  #1133  
						
							2018-06-18 15:14:10 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Danielc 
								
							 
						 
						
							
							
							
							
								
							
							
								1566ad4053 
								
							 
						 
						
							
							
								
								fixed compile error for  #1045 ; to_json for iternation_proxy_internal was needed  
							
							
							
						 
						
							2018-06-16 12:01:49 +03:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Vitaliy 
								
							 
						 
						
							
							
							
							
								
							
							
								f574d7e084 
								
							 
						 
						
							
							
								
								simplify templates for operators, add more checks  
							
							
							
						 
						
							2018-06-14 15:07:06 +03:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Vitaliy 
								
							 
						 
						
							
							
							
							
								
							
							
								cd28d872e7 
								
							 
						 
						
							
							
								
								forward declarations to make new compilers happy  
							
							
							
						 
						
							2018-06-11 20:50:39 +03:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Vitaliy 
								
							 
						 
						
							
							
							
							
								
							
							
								3d3055909c 
								
							 
						 
						
							
							
								
								define global operator< for const char* and alt_string  
							
							
							
						 
						
							2018-06-11 19:09:57 +03:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Vitaliy 
								
							 
						 
						
							
							
							
							
								
							
							
								4feb8211ca 
								
							 
						 
						
							
							
								
								test (non)equality for alt_string implementation  
							
							
							
						 
						
							2018-06-11 18:03:46 +03:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Guillaume Racicot 
								
							 
						 
						
							
							
							
							
								
							
							
								714c592680 
								
							 
						 
						
							
							
								
								Disabled implicit conversion to string_view on MSVC 15.13 and older  
							
							
							
						 
						
							2018-06-01 14:22:57 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e5a67fc3f8 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of  https://github.com/nlohmann/json  into develop  
							
							
							
						 
						
							2018-05-28 17:57:46 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a49644ab74 
								
							 
						 
						
							
							
								
								🚑  adjusted Fuzzer to new parser  
							
							... 
							
							
							
							out_of_range exceptions where unexpected before - the parser used to crash in these situations... 
							
						 
						
							2018-05-28 17:57:22 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0efaf891e5 
								
							 
						 
						
							
							
								
								Merge pull request  #1089  from theodelrieu/feature/map_conversion  
							
							... 
							
							
							
							Provide a from_json overload for std::map 
							
						 
						
							2018-05-28 14:53:23 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Théo DELRIEU 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c5e63fd684 
								
							 
						 
						
							
							
								
								Provide a from_json overload for std::map  
							
							... 
							
							
							
							This overload is chosen only when BasicJsonType::string_t
is not constructible from std::map::key_type.
Currently, converting a map to json treats it as an array of pairs.
fixes  #1079  
							
						 
						
							2018-05-28 11:06:24 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1f84cc2c88 
								
							 
						 
						
							
							
								
								✅  adjusted test cases  
							
							
							
						 
						
							2018-05-17 16:50:37 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								717301d1bc 
								
							 
						 
						
							
							
								
								Merge branch 'testsuite' into feature/sax2  
							
							
							
						 
						
							2018-05-17 16:36:43 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4639bb2c8f 
								
							 
						 
						
							
							
								
								✅  added more tests from recent nst's JSONTestSuite  
							
							
							
						 
						
							2018-05-17 10:10:01 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5ff2abb90d 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/sax2  
							
							
							
						 
						
							2018-05-06 13:29:23 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ed69e50ad2 
								
							 
						 
						
							
							
								
								📄  added SPDX-License-Identifier  
							
							
							
						 
						
							2018-05-03 17:41:45 +02:00