HenryLee 
								
							 
						 
						
							
							
							
							
								
							
							
								790e7ca9e9 
								
							 
						 
						
							
							
								
								Add struct keyword in front of internal_iterator  
							
							
							
						 
						
							2017-05-30 20:27:05 +10:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									HenryLee 
								
							 
						 
						
							
							
							
							
								
							
							
								ce39330ff8 
								
							 
						 
						
							
							
								
								Add converting constructors for iterator  
							
							
							
						 
						
							2017-05-30 20:23:25 +10:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									HenryLee 
								
							 
						 
						
							
							
							
							
								
							
							
								c4ab8f827e 
								
							 
						 
						
							
							
								
								Change iterator category to random access  
							
							
							
						 
						
							2017-05-30 19:44:55 +10:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									HenryLee 
								
							 
						 
						
							
							
							
							
								
							
							
								daea213b44 
								
							 
						 
						
							
							
								
								Use static cast in the implementation of the operators of reverse iterator  
							
							
							
						 
						
							2017-05-29 23:56:21 +10:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									HenryLee 
								
							 
						 
						
							
							
							
							
								
							
							
								0c2ed00ebe 
								
							 
						 
						
							
							
								
								Add missing test cases for n + it arithmetic in iterators  
							
							
							
						 
						
							2017-05-29 22:39:27 +10:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									HenryLee 
								
							 
						 
						
							
							
							
							
								
							
							
								5b245dae06 
								
							 
						 
						
							
							
								
								Comment out the exception message check in operator[] of reverse iterator  
							
							
							
						 
						
							2017-05-29 22:19:10 +10:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									HenryLee 
								
							 
						 
						
							
							
							
							
								
							
							
								e42db27d6d 
								
							 
						 
						
							
							
								
								Fix the indentation from the latest commit  
							
							
							
						 
						
							2017-05-29 20:02:58 +10:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									HenryLee 
								
							 
						 
						
							
							
							
							
								
							
							
								3aef1a582e 
								
							 
						 
						
							
							
								
								Change the definition of the operator override of reverse iterator to using the result of the base class directly  
							
							
							
						 
						
							2017-05-29 19:45:34 +10:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									HenryLee 
								
							 
						 
						
							
							
							
							
								
							
							
								a3bf0131c4 
								
							 
						 
						
							
							
								
								Fix some more reverse iterator arithmetic test codes  
							
							
							
						 
						
							2017-05-29 19:43:45 +10:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									HenryLee 
								
							 
						 
						
							
							
							
							
								
							
							
								adc73d6d5f 
								
							 
						 
						
							
							
								
								Fix the arithmetic mistakes in reverse iterator  
							
							
							
						 
						
							2017-05-29 18:52:53 +10:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									HenryLee 
								
							 
						 
						
							
							
							
							
								
							
							
								ed62129f8e 
								
							 
						 
						
							
							
								
								Override n + iterator operator in the iterator  
							
							
							
						 
						
							2017-05-27 13:44:14 +10:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								52adf3fd5b 
								
							 
						 
						
							
							
								
								🔨  fixed compilation  
							
							
							
						 
						
							2017-05-22 22:59:57 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9a576fe1d9 
								
							 
						 
						
							
							
								
								✅  added test for  #367  
							
							
							
						 
						
							2017-05-22 22:49:39 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c7bd01edf2 
								
							 
						 
						
							
							
								
								🔨  trying something  #367  
							
							
							
						 
						
							2017-05-22 17:06:46 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9e507dfad5 
								
							 
						 
						
							
							
								
								✅  tests and fix for  #367  
							
							... 
							
							
							
							operator>> now works as expected. 
							
						 
						
							2017-05-21 16:36:51 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								16b63d3197 
								
							 
						 
						
							
							
								
								🔨  working toward  #367  
							
							
							
						 
						
							2017-05-20 12:44:13 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8a35fdd8f5 
								
							 
						 
						
							
							
								
								🔨  overworked accept() function  
							
							... 
							
							
							
							Fixed to make sure no token is "overlooked". 
							
						 
						
							2017-05-20 12:24:13 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9ddc69f3a9 
								
							 
						 
						
							
							
								
								🐛  adjusting fix for future versions  #586  
							
							
							
						 
						
							2017-05-20 10:49:06 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								99cb095e89 
								
							 
						 
						
							
							
								
								🐛  fix for  #586  
							
							... 
							
							
							
							Also added a Travis builder with -std=c++1z 
							
						 
						
							2017-05-20 10:34:49 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
							
							
								
							
							
								0f4131d138 
								
							 
						 
						
							
							
								
								Merge pull request  #583  from zhaohuaxishi/doxygen_error  
							
							... 
							
							
							
							fix doxygen error of basic_json::get() 
							
						 
						
							2017-05-15 21:09:43 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0c3ffe12cd 
								
							 
						 
						
							
							
								
								⏪  reverting first/second experiment  #350  
							
							
							
						 
						
							2017-05-15 21:07:58 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									郭荣飞 
								
							 
						 
						
							
							
							
							
								
							
							
								b8dff3bc16 
								
							 
						 
						
							
							
								
								remove the redundant @ref command  
							
							
							
						 
						
							2017-05-14 07:59:07 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								723c875604 
								
							 
						 
						
							
							
								
								💬  replaced "backspace" with "backslash"  #509  
							
							
							
						 
						
							2017-05-13 19:56:38 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									郭荣飞 
								
							 
						 
						
							
							
							
							
								
							
							
								dfa371c436 
								
							 
						 
						
							
							
								
								fix doxygen error of basic_json::get()  
							
							
							
						 
						
							2017-05-13 23:13:04 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9b764ee5d6 
								
							 
						 
						
							
							
								
								🏁  fix for  #581  
							
							
							
						 
						
							2017-05-13 12:27:37 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								978255da8c 
								
							 
						 
						
							
							
								
								📝  updated contribution guidelines  
							
							
							
						 
						
							2017-05-13 11:57:15 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
							
							
								
							
							
								8b88e1b266 
								
							 
						 
						
							
							
								
								Merge pull request  #579  from Type1J/develop_feature_first_second  
							
							... 
							
							
							
							Fixing assignement for iterator wrapper second, and adding unit test 
							
						 
						
							2017-05-13 11:37:57 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jay Sistar 
								
							 
						 
						
							
							
							
							
								
							
							
								b78457b792 
								
							 
						 
						
							
							
								
								Making comparison operators const.  
							
							
							
						 
						
							2017-05-11 13:22:47 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jay Sistar 
								
							 
						 
						
							
							
							
							
								
							
							
								00d841bfda 
								
							 
						 
						
							
							
								
								Adding equal and not equal operators to proxys.  
							
							
							
						 
						
							2017-05-11 14:51:06 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jay Sistar 
								
							 
						 
						
							
							
							
							
								
							
							
								d6c78dacd8 
								
							 
						 
						
							
							
								
								Fixing assignement for iterator wrapper second, and adding unit test  
							
							
							
						 
						
							2017-05-10 17:53:27 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
							
							
								
							
							
								5beea35443 
								
							 
						 
						
							
							
								
								Merge pull request  #578  from Type1J/develop_feature_first_second  
							
							... 
							
							
							
							Adding first and second properties to iteration_proxy_internal 
							
						 
						
							2017-05-10 17:25:54 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
							
							
								
							
							
								15ef9b8a35 
								
							 
						 
						
							
							
								
								Merge pull request  #576  from Type1J/develop  
							
							... 
							
							
							
							Adding support for Meson. 
							
						 
						
							2017-05-10 16:32:14 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jay Sistar 
								
							 
						 
						
							
							
							
							
								
							
							
								6a656ed375 
								
							 
						 
						
							
							
								
								Adding first and second properties to iteration_proxy_internal  
							
							
							
						 
						
							2017-05-10 13:20:52 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2afbd33472 
								
							 
						 
						
							
							
								
								🔨  working on  #367  
							
							... 
							
							
							
							Test cases succeed as expected, but the example in #367  is not fully
realized yet. 
							
						 
						
							2017-05-10 12:06:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jay Sistar 
								
							 
						 
						
							
							
							
							
								
							
							
								87744fd594 
								
							 
						 
						
							
							
								
								Missed one.  
							
							
							
						 
						
							2017-05-09 02:04:02 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jay Sistar 
								
							 
						 
						
							
							
							
							
								
							
							
								0719287e44 
								
							 
						 
						
							
							
								
								Reducing chatter about Meson.  
							
							
							
						 
						
							2017-05-09 02:01:55 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jay Sistar 
								
							 
						 
						
							
							
							
							
								
							
							
								31fe2f5825 
								
							 
						 
						
							
							
								
								Adding support for Meson.  
							
							
							
						 
						
							2017-05-08 13:35:00 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								962da00171 
								
							 
						 
						
							
							
								
								✨  implemented an indentation character  #520  
							
							... 
							
							
							
							An optional parameter for dump() allows to set the character to use for
indentation (default: space). In case a JSON value is serialized to an
output stream, its fill character is used (and can be set with
std::setfill). 
							
						 
						
							2017-05-07 19:27:40 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								fba1bcdd0b 
								
							 
						 
						
							
							
								
								🐛  fixing  #575  
							
							... 
							
							
							
							I forgot to consider the offset. 
							
						 
						
							2017-05-07 13:41:48 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								56ac7908f1 
								
							 
						 
						
							
							
								
								Merge branch 'feature/manual_lexer' into develop  
							
							
							
						 
						
							2017-05-05 18:27:56 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								dbcb032f22 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/manual_lexer  
							
							
							
						 
						
							2017-05-05 16:48:47 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ecf895f2d1 
								
							 
						 
						
							
							
								
								📝  mentioned value function on main doc page  #570  
							
							
							
						 
						
							2017-05-05 16:42:22 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								19d2dec8b6 
								
							 
						 
						
							
							
								
								📝  added badge from isitmaintained.com  
							
							
							
						 
						
							2017-05-03 22:49:21 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8b9f51179e 
								
							 
						 
						
							
							
								
								✨  started working on  #458  
							
							... 
							
							
							
							a simple acceptor function 
							
						 
						
							2017-04-24 17:46:21 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								cfc2e8391c 
								
							 
						 
						
							
							
								
								🔨  removed too long running tests  
							
							
							
						 
						
							2017-04-24 15:07:43 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6d2c0a7928 
								
							 
						 
						
							
							
								
								✅  added more Unicode test cases  
							
							
							
						 
						
							2017-04-23 22:54:21 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c42273d2a0 
								
							 
						 
						
							
							
								
								📝  fixed documentation  #565  
							
							... 
							
							
							
							The documentation mismatched the actual code. 
							
						 
						
							2017-04-23 21:46:30 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2df8f12c09 
								
							 
						 
						
							
							
								
								🏁  another fix for MSVC  #464  
							
							... 
							
							
							
							needed for VS2015.3 with /std:c++latest 
							
						 
						
							2017-04-23 20:51:29 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								734297ff45 
								
							 
						 
						
							
							
								
								🔨  cleanup  
							
							
							
						 
						
							2017-04-23 20:32:05 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								01e05d89e9 
								
							 
						 
						
							
							
								
								🔨  fixed a compiler warning  
							
							... 
							
							
							
							Default arguments are forbidden in lambdas. 
							
						 
						
							2017-04-23 18:40:17 +02:00