Théo DELRIEU
								
							 
						 | 
						
							
							
							
							
								
							
							
								60e6f822fa
								
							
						 | 
						
							
							
								
								add support for non-default-constructible udt
							
							
							
							
							
						 | 
						
							2017-01-21 16:14:21 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Théo DELRIEU
								
							 
						 | 
						
							
							
							
							
								
							
							
								e5999c6c82
								
							
						 | 
						
							
							
								
								add a few tests
							
							
							
							
							
						 | 
						
							2017-01-21 16:14:21 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Théo Delrieu
								
							 
						 | 
						
							
							
							
							
								
							
							
								74bb11d92c
								
							
						 | 
						
							
							
								
								remove some useless checks, format a bit, added some comments
							
							
							
							
							
						 | 
						
							2017-01-21 16:14:21 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Théo DELRIEU
								
							 
						 | 
						
							
							
							
							
								
							
							
								907484fb43
								
							
						 | 
						
							
							
								
								format biggest lines
							
							
							
							
							
						 | 
						
							2017-01-21 16:14:21 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Théo Delrieu
								
							 
						 | 
						
							
							
							
							
								
							
							
								47bc402113
								
							
						 | 
						
							
							
								
								only use conjunction & co when needed to avoid MSVC crashing
							
							
							
							
							
						 | 
						
							2017-01-21 16:14:21 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Théo DELRIEU
								
							 
						 | 
						
							
							
							
							
								
							
							
								ee19acaf05
								
							
						 | 
						
							
							
								
								add is_compatible_basic_json_type trait
							
							
							
							
							
						 | 
						
							2017-01-21 16:14:21 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Théo Delrieu
								
							 
						 | 
						
							
							
							
							
								
							
							
								9b401972a0
								
							
						 | 
						
							
							
								
								add a macro for has_xxx types
							
							
							
							
							
						 | 
						
							2017-01-21 16:14:21 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Théo DELRIEU
								
							 
						 | 
						
							
							
							
							
								
							
							
								e2dbe7a69f
								
							
						 | 
						
							
							
								
								correctly constrain basic_json udt constructor
							
							
							
							
							
						 | 
						
							2017-01-21 16:14:21 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Théo DELRIEU
								
							 
						 | 
						
							
							
							
							
								
							
							
								0d91113ccf
								
							
						 | 
						
							
							
								
								add negation, disjunction, and conjunction from C++17
							
							
							
							
							
						 | 
						
							2017-01-21 16:14:21 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Théo DELRIEU
								
							 
						 | 
						
							
							
							
							
								
							
							
								88819449c2
								
							
						 | 
						
							
							
								
								remove constraints on JSONSerializer instances, constrain correctly new methods
							
							
							
							
							
						 | 
						
							2017-01-21 16:14:21 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Théo DELRIEU
								
							 
						 | 
						
							
							
							
							
								
							
							
								23bd2bce35
								
							
						 | 
						
							
							
								
								add is_compatible_* traits
							
							
							
							
							
						 | 
						
							2017-01-21 16:14:21 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Théo DELRIEU
								
							 
						 | 
						
							
							
							
							
								
							
							
								178441cdfd
								
							
						 | 
						
							
							
								
								add basic test for custom serializer
							
							
							
							
							
						 | 
						
							2017-01-21 16:14:21 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Théo DELRIEU
								
							 
						 | 
						
							
							
							
							
								
							
							
								2bc685f6b4
								
							
						 | 
						
							
							
								
								to_json and from_json takes both two arguments now
							
							
							
							
							
							
							
							the first is the basic_json type, the second the user-defined type 
							
						 | 
						
							2017-01-21 16:14:21 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Théo DELRIEU
								
							 
						 | 
						
							
							
							
							
								
							
							
								837b81d672
								
							
						 | 
						
							
							
								
								renamed unit-constructor3.cpp to unit-udt.cpp
							
							
							
							
							
						 | 
						
							2017-01-21 16:14:21 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Théo DELRIEU
								
							 
						 | 
						
							
							
							
							
								
							
							
								33abccf847
								
							
						 | 
						
							
							
								
								add template arguments for JSONSerializer
							
							
							
							
							
						 | 
						
							2017-01-21 16:14:21 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Théo DELRIEU
								
							 
						 | 
						
							
							
							
							
								
							
							
								7dc268ef42
								
							
						 | 
						
							
							
								
								add first version for alternate implementation
							
							
							
							
							
						 | 
						
							2017-01-21 16:14:21 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Théo DELRIEU
								
							 
						 | 
						
							
							
							
							
								
							
							
								4cdc61e493
								
							
						 | 
						
							
							
								
								move most SFINAE trickery in to/from_json_fn
							
							
							
							
							
						 | 
						
							2017-01-21 16:14:21 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Théo DELRIEU
								
							 
						 | 
						
							
							
							
							
								
							
							
								03b391c37b
								
							
						 | 
						
							
							
								
								remove has_destructor and has_json_traits, use decltype instead
							
							
							
							
							
						 | 
						
							2017-01-21 16:14:21 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Théo DELRIEU
								
							 
						 | 
						
							
							
							
							
								
							
							
								12b4555b13
								
							
						 | 
						
							
							
								
								use uncvref_t<T> instead of remove_cv_t<remove_reference_t<T>>>
							
							
							
							
							
						 | 
						
							2017-01-21 16:14:21 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Théo DELRIEU
								
							 
						 | 
						
							
							
							
							
								
							
							
								877d96c1d8
								
							
						 | 
						
							
							
								
								rename __static_const to _static_const (reserved identifier)
							
							
							
							
							
						 | 
						
							2017-01-21 16:14:21 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Théo DELRIEU
								
							 
						 | 
						
							
							
							
							
								
							
							
								d54d6bb84c
								
							
						 | 
						
							
							
								
								add alias templates to reduce boilerplate
							
							
							
							
							
						 | 
						
							2017-01-21 16:14:21 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Théo DELRIEU
								
							 
						 | 
						
							
							
							
							
								
							
							
								fe628b585b
								
							
						 | 
						
							
							
								
								anonymous namespace renamed to detail
							
							
							
							
							
						 | 
						
							2017-01-21 16:14:21 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Théo Delrieu
								
							 
						 | 
						
							
							
							
							
								
							
							
								b443edf49e
								
							
						 | 
						
							
							
								
								add first version support for user-defined types
							
							
							
							
							
						 | 
						
							2017-01-21 16:14:20 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
							
							
								
							
							
								ce0b3fe5a3
								
							
						 | 
						
							
							
								
								🚧 made type_name() public
							
							
							
							
							
						 | 
						
							2017-01-21 16:12:17 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
							
							
								
							
							
								145188f264
								
							
						 | 
						
							
							
								
								⏪ renaming did not help
							
							
							
							
							
						 | 
						
							2017-01-19 19:23:56 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
							
							
								
							
							
								69be3fa842
								
							
						 | 
						
							
							
								
								📝 small documentation update
							
							
							
							
							
						 | 
						
							2017-01-19 18:19:20 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
							
							
								
							
							
								5e3f9c8969
								
							
						 | 
						
							
							
								
								📄 help Github find the license
							
							
							
							
							
						 | 
						
							2017-01-19 17:09:55 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
							
							
								
							
							
								e951d198f4
								
							
						 | 
						
							
							
								
								🔀 merge pull request #430 from vjon/patch-1
							
							
							
							
							
							
							
							Fix documentation error 
							
						 | 
						
							2017-01-19 07:42:29 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Jonathan Lee
								
							 
						 | 
						
							
							
							
							
								
							
							
								046f6da82f
								
							
						 | 
						
							
							
								
								Fix documentation error
							
							
							
							
							
							
							
							Move comparison before "j.clear()" function call, such that the intended return value "true" is actually correct. 
							
						 | 
						
							2017-01-18 11:43:14 -08:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
							
							
								
							
							
								bae8e70137
								
							
						 | 
						
							
							
								
								🔀 merge branch 'feature/noexceptions_2' into develop
							
							
							
							
							
						 | 
						
							2017-01-18 20:41:17 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
							
							
								
							
							
								87c5e32e1f
								
							
						 | 
						
							
							
								
								🐛 fixed escaping
							
							
							
							
							
						 | 
						
							2017-01-16 22:46:49 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
							
							
								
							
							
								a00149f8ee
								
							
						 | 
						
							
							
								
								🐛 fixed logic error
							
							
							
							
							
						 | 
						
							2017-01-16 22:36:58 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
							
							
								
							
							
								1ab26ab367
								
							
						 | 
						
							
							
								
								✨ option to switch off exceptions
							
							
							
							
							
						 | 
						
							2017-01-16 22:11:07 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
							
							
								
							
							
								74cbd30cd0
								
							
						 | 
						
							
							
								
								📄 it's 2017
							
							
							
							
							
						 | 
						
							2017-01-16 20:04:47 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
							
							
								
							
							
								a7f3938391
								
							
						 | 
						
							
							
								
								✅ added Big List of Naughty Strings
							
							
							
							
							
						 | 
						
							2017-01-16 20:03:50 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
							
							
								
							
							
								a9b4cb8bf8
								
							
						 | 
						
							
							
								
								🔀 merge branch 'feature/release_information' into develop #397
							
							
							
							
							
						 | 
						
							2017-01-12 21:37:31 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
							
							
								
							
							
								3a9ccfac22
								
							
						 | 
						
							
							
								
								🚧 cleanup
							
							
							
							
							
						 | 
						
							2017-01-12 21:35:27 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
							
							
								
							
							
								98ad3c3ac1
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into feature/release_information
							
							
							
							
							
						 | 
						
							2017-01-12 21:30:08 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
							
							
								
							
							
								0f03543861
								
							
						 | 
						
							
							
								
								⬆️ upgraded to Catch 1.6.0
							
							
							
							
							
						 | 
						
							2017-01-11 22:23:02 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
							
							
								
							
							
								e9bbf5aaba
								
							
						 | 
						
							
							
								
								🐛 forgot to remove a test case
							
							
							
							
							
						 | 
						
							2017-01-08 09:31:40 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
							
							
								
							
							
								dd45ba6f89
								
							
						 | 
						
							
							
								
								🚧 renamed version() to meta()
							
							
							
							
							
						 | 
						
							2017-01-08 09:19:44 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex Astashyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								c236b596c9
								
							
						 | 
						
							
							
								
								Merge upstream/develop into feature/locale_independent_str_to_num
							
							
							
							
							
						 | 
						
							2017-01-04 19:20:16 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex Astashyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								949061079a
								
							
						 | 
						
							
							
								
								Merge upstream/develop into feature/locale_independent_num_to_str
							
							
							
							
							
						 | 
						
							2017-01-04 18:55:19 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
							
							
								
							
							
								e1b89dd1d6
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into feature/release_information
							
							
							
							
							
						 | 
						
							2017-01-04 20:06:23 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
							
							
								
							
							
								9f6c86f233
								
							
						 | 
						
							
							
								
								🐛 fix for #417
							
							
							
							
							
						 | 
						
							2017-01-04 18:54:44 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
							
							
								
							
							
								4765070318
								
							
						 | 
						
							
							
								
								📝 added documentation wrt. UTF-8 strings #406
							
							
							
							
							
						 | 
						
							2017-01-04 18:07:46 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
							
							
								
							
							
								cdd3b5a68c
								
							
						 | 
						
							
							
								
								🚑 fix for #416
							
							
							
							
							
						 | 
						
							2017-01-03 23:52:01 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
							
							
								
							
							
								767637877b
								
							
						 | 
						
							
							
								
								💄 cleanup
							
							
							
							
							
						 | 
						
							2017-01-03 22:37:07 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
							
							
								
							
							
								f8d640b185
								
							
						 | 
						
							
							
								
								👷 better support for OSS-Fuzz
							
							
							
							
							
						 | 
						
							2017-01-03 22:35:31 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
							
							
								
							
							
								245a69d554
								
							
						 | 
						
							
							
								
								💄 ran clang-tidy
							
							
							
							
							
						 | 
						
							2017-01-03 21:33:23 +01:00 | 
						
						
							
							
							
							
								
							
							
						 |