Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b224c52376 
								
							 
						 
						
							
							
								
								🎨  cleanup  
							
							
							
						 
						
							2019-03-19 09:17:14 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								37a72dac48 
								
							 
						 
						
							
							
								
								💚  forgot two semicolons  
							
							
							
						 
						
							2019-03-18 17:23:34 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8d3f4f21bc 
								
							 
						 
						
							
							
								
								🔨  clean up  
							
							
							
						 
						
							2019-03-18 13:53:48 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								22c733e6fe 
								
							 
						 
						
							
							
								
								📝  added documentation  
							
							
							
						 
						
							2019-03-17 22:25:18 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								56f6d1d68e 
								
							 
						 
						
							
							
								
								💚  fix CI and  #1521  
							
							
							
						 
						
							2019-03-17 15:20:22 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b8451c236f 
								
							 
						 
						
							
							
								
								🚨  fixed warnings  
							
							
							
						 
						
							2019-03-17 12:01:49 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								34f8b4f711 
								
							 
						 
						
							
							
								
								🚨  fixed more warnings  
							
							
							
						 
						
							2019-03-17 00:27:44 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b02ee16721 
								
							 
						 
						
							
							
								
								🚨  fixed warnings  
							
							
							
						 
						
							2019-03-15 15:55:52 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								27011e3718 
								
							 
						 
						
							
							
								
								🚨  fixed warnings  
							
							
							
						 
						
							2019-03-15 14:55:13 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c6fc902184 
								
							 
						 
						
							
							
								
								Merge pull request  #1489  from andreas-schwab/develop  
							
							... 
							
							
							
							Do proper endian conversions 
							
						 
						
							2019-03-13 11:57:58 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3cd1dac653 
								
							 
						 
						
							
							
								
								🚨  fix MSVC warning  #1502  
							
							
							
						 
						
							2019-03-11 15:33:23 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Andreas Schwab 
								
							 
						 
						
							
							
							
							
								
							
							
								bb22b1003f 
								
							 
						 
						
							
							
								
								Do proper endian conversions  
							
							... 
							
							
							
							This fixes all testsuite failures on big endian hosts. 
							
						 
						
							2019-02-25 12:09:13 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5c04cc1009 
								
							 
						 
						
							
							
								
								🔨  fixed includes  
							
							
							
						 
						
							2019-01-13 15:31:22 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8e9ad346d9 
								
							 
						 
						
							
							
								
								🚨  fixed another linter warning  
							
							
							
						 
						
							2019-01-13 13:00:54 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c682b9879b 
								
							 
						 
						
							
							
								
								🚨  fixed PVS V567 warning  
							
							... 
							
							
							
							"V567 The modification of the 'position.chars_read_current_line' variable is unsequenced relative to another operation on the same variable. This may lead to undefined behavior." 
							
						 
						
							2018-12-30 23:00:15 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4f270e38cc 
								
							 
						 
						
							
							
								
								Merge pull request  #1342  from davedissian/bugfix/sfinae-iterator-traits  
							
							... 
							
							
							
							Add a SFINAE friendly iterator_traits and use that instead. 
							
						 
						
							2018-12-19 08:24:18 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5d390e91ff 
								
							 
						 
						
							
							
								
								Merge pull request  #1392  from mtalliance/feature/addFileInputAdapter  
							
							... 
							
							
							
							Feature/add file input adapter 
							
						 
						
							2018-12-16 22:10:03 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Jonathan Dumaresq 
								
							 
						 
						
							
							
							
							
								
							
							
								c1c85b025c 
								
							 
						 
						
							
							
								
								Forget one std::FILE  
							
							
							
						 
						
							2018-12-14 07:33:28 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Jonathan Dumaresq 
								
							 
						 
						
							
							
							
							
								
							
							
								635a4fc344 
								
							 
						 
						
							
							
								
								use namespace std when possible. Change the name of private variable.  
							
							
							
						 
						
							2018-12-12 16:33:25 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Jonathan Dumaresq 
								
							 
						 
						
							
							
							
							
								
							
							
								91ff96a737 
								
							 
						 
						
							
							
								
								remove the const attribute  
							
							
							
						 
						
							2018-12-12 14:16:12 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Jonathan Dumaresq 
								
							 
						 
						
							
							
							
							
								
							
							
								b7a2642fba 
								
							 
						 
						
							
							
								
								remove comment  
							
							
							
						 
						
							2018-12-12 14:15:49 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Jonathan Dumaresq 
								
							 
						 
						
							
							
							
							
								
							
							
								ef283e0cf8 
								
							 
						 
						
							
							
								
								add tests to cover the new input adapter  
							
							
							
						 
						
							2018-12-12 10:18:37 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Jonathan Dumaresq 
								
							 
						 
						
							
							
							
							
								
							
							
								ae48acbb23 
								
							 
						 
						
							
							
								
								remove non usefull code. Add small description  
							
							
							
						 
						
							2018-12-12 09:28:42 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Jonathan Dumaresq 
								
							 
						 
						
							
							
							
							
								
							
							
								52f6fd1d91 
								
							 
						 
						
							
							
								
								Add the possibility of using FILE * from cstdio library to read a file. This enable the possibility of using low eand device with this library.  
							
							
							
						 
						
							2018-12-11 13:17:13 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ef90d62ddf 
								
							 
						 
						
							
							
								
								🚨  fixed warning  #1364  
							
							
							
						 
						
							2018-11-21 21:17:38 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								da81e7be22 
								
							 
						 
						
							
							
								
								🏁  adding parentheses around std::snprintf calls  #1337  
							
							
							
						 
						
							2018-11-09 21:18:02 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f80efd3954 
								
							 
						 
						
							
							
								
								💄  cleanup  
							
							
							
						 
						
							2018-11-09 21:10:32 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									mefyl 
								
							 
						 
						
							
							
							
							
								
							
							
								aa10382629 
								
							 
						 
						
							
							
								
								Set eofbit on exhausted input stream.  
							
							... 
							
							
							
							Fix issue #1340 .
        The eofbit is set manually since we don't go through the
	stream interface. We could maybe use the stream interface
	instead, but there are some assumptions regarding which
	exception go through, so this seems to be the most prudent
	approach for now. 
							
						 
						
							2018-11-08 11:41:17 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									David Avedissian 
								
							 
						 
						
							
							
							
							
								
							
							
								f665a92330 
								
							 
						 
						
							
							
								
								Implement SFINAE friendly iterator_traits and use that instead.  
							
							
							
						 
						
							2018-11-07 18:39:25 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2f73a4d1f3 
								
							 
						 
						
							
							
								
								🚨  fixed a linter warning  
							
							
							
						 
						
							2018-10-31 20:30:24 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d2e4f0b0d9 
								
							 
						 
						
							
							
								
								✏️  fixed some typos  
							
							
							
						 
						
							2018-10-28 14:20:20 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f0c1459554 
								
							 
						 
						
							
							
								
								🐛  fixed a bug parsing BSON strings  #1320  
							
							
							
						 
						
							2018-10-28 09:16:40 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4e765596f7 
								
							 
						 
						
							
							
								
								🔨  small improvements  
							
							
							
						 
						
							2018-10-27 18:31:03 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								19647e083c 
								
							 
						 
						
							
							
								
								🚨  fixed compiler warnings  
							
							
							
						 
						
							2018-10-25 14:27:55 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1968e5c793 
								
							 
						 
						
							
							
								
								🎨  clean up binary formats  
							
							
							
						 
						
							2018-10-24 23:39:30 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Julian Becker 
								
							 
						 
						
							
							
							
							
								
							
							
								2a63869159 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of  https://github.com/nlohmann/json  into feature/bson  
							
							... 
							
							
							
							Conflicts:
	include/nlohmann/detail/input/binary_reader.hpp
	single_include/nlohmann/json.hpp
	src/unit-bson.cpp 
							
						 
						
							2018-10-17 20:26:00 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								dbb0b63187 
								
							 
						 
						
							
							
								
								♿  improved error messages for binary formats  #1288  
							
							... 
							
							
							
							This commit is the equivalent of #1282  for CBOR, MessagePack, and UBJSON. 
							
						 
						
							2018-10-17 12:15:58 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Julian Becker 
								
							 
						 
						
							
							
							
							
								
							
							
								5bccacda30 
								
							 
						 
						
							
							
								
								BSON: throw json.exception.out_of_range.407 in case a value of type std::uint64_t is serialized to BSON. Also, added a missing EOF-check to binary_reader.  
							
							
							
						 
						
							2018-10-16 19:13:07 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e426219256 
								
							 
						 
						
							
							
								
								Merge pull request  #1282  from nlohmann/feature/lines_columns  
							
							... 
							
							
							
							Improve diagnostic messages 
							
						 
						
							2018-10-08 22:17:33 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								74a31075e3 
								
							 
						 
						
							
							
								
								♿  improved parse error messages  
							
							
							
						 
						
							2018-10-07 22:39:17 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6e49d9f5ff 
								
							 
						 
						
							
							
								
								🚑  fixed compilation error  
							
							
							
						 
						
							2018-10-07 21:34:40 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f8158997b5 
								
							 
						 
						
							
							
								
								📝  fixed documentation  
							
							
							
						 
						
							2018-10-07 21:30:58 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3abb788139 
								
							 
						 
						
							
							
								
								🚨  fixed some more clang-tidy warnings  
							
							
							
						 
						
							2018-10-07 19:07:58 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								858e75c4df 
								
							 
						 
						
							
							
								
								🚨  fixed some clang-tidy warnings  
							
							
							
						 
						
							2018-10-07 18:39:18 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6d09cdec34 
								
							 
						 
						
							
							
								
								🐛  fixed a bug in the unget function  
							
							
							
						 
						
							2018-10-07 16:48:45 +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 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Julian Becker 
								
							 
						 
						
							
							
							
							
								
							
							
								81f4b34e06 
								
							 
						 
						
							
							
								
								BSON: Improved documentation and error handling/reporting  
							
							
							
						 
						
							2018-10-07 09:57:55 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								fa722d5ac3 
								
							 
						 
						
							
							
								
								🚨  fixed another linter warning  
							
							
							
						 
						
							2018-10-06 16:26:47 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ec95438a59 
								
							 
						 
						
							
							
								
								🚨  fixed some linter warnings  
							
							
							
						 
						
							2018-10-06 13:49:02 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								bb55885215 
								
							 
						 
						
							
							
								
								💄  cleaned code  
							
							
							
						 
						
							2018-10-04 20:42:19 +02:00