Niels 
								
							 
						 
						
							
							
							
							
								
							
							
								0a393b8374 
								
							 
						 
						
							
							
								
								indentation cleanup  
							
							
							
						 
						
							2016-05-12 07:34:36 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels 
								
							 
						 
						
							
							
							
							
								
							
							
								9ecf83f630 
								
							 
						 
						
							
							
								
								working on  #235  
							
							
							
						 
						
							2016-05-08 20:28:20 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels 
								
							 
						 
						
							
							
							
							
								
							
							
								ea84a85b13 
								
							 
						 
						
							
							
								
								simplified flatten/unflatten examples  
							
							
							
						 
						
							2016-04-30 10:39:03 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels 
								
							 
						 
						
							
							
							
							
								
							
							
								1d3b4dd158 
								
							 
						 
						
							
							
								
								added test cases  
							
							
							
						 
						
							2016-04-30 00:03:47 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels 
								
							 
						 
						
							
							
							
							
								
							
							
								5e0bf75d60 
								
							 
						 
						
							
							
								
								cleanup, test, and diff  
							
							
							
						 
						
							2016-04-25 23:17:04 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels 
								
							 
						 
						
							
							
							
							
								
							
							
								f4107d0d9c 
								
							 
						 
						
							
							
								
								updated documentation  
							
							
							
						 
						
							2016-04-17 23:36:37 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels 
								
							 
						 
						
							
							
							
							
								
							
							
								08c97df420 
								
							 
						 
						
							
							
								
								added examples  
							
							
							
						 
						
							2016-04-17 23:18:07 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels 
								
							 
						 
						
							
							
							
							
								
							
							
								6268287940 
								
							 
						 
						
							
							
								
								improved documentation and test coverage  
							
							
							
						 
						
							2016-04-17 22:08:21 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels 
								
							 
						 
						
							
							
							
							
								
							
							
								f883a04c87 
								
							 
						 
						
							
							
								
								more documentation  
							
							
							
						 
						
							2016-04-17 18:18:49 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels 
								
							 
						 
						
							
							
							
							
								
							
							
								40e899a819 
								
							 
						 
						
							
							
								
								cleanup and documentation  
							
							
							
						 
						
							2016-04-17 17:39:35 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels 
								
							 
						 
						
							
							
							
							
								
							
							
								d869b0a387 
								
							 
						 
						
							
							
								
								updated online documentation  
							
							
							
						 
						
							2016-02-14 22:28:56 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels 
								
							 
						 
						
							
							
							
							
								
							
							
								236b7afff5 
								
							 
						 
						
							
							
								
								updated and fixed online version  
							
							
							
						 
						
							2016-02-07 15:07:17 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels 
								
							 
						 
						
							
							
							
							
								
							
							
								2c720b26ab 
								
							 
						 
						
							
							
								
								added a constructor from an input stream  
							
							
							
						 
						
							2016-02-05 19:24:42 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels 
								
							 
						 
						
							
							
							
							
								
							
							
								6aa881988d 
								
							 
						 
						
							
							
								
								improved documentation  
							
							
							
						 
						
							2016-01-31 13:05:39 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels 
								
							 
						 
						
							
							
							
							
								
							
							
								9d063d90e3 
								
							 
						 
						
							
							
								
								removed "using namespace" from examples  
							
							
							
						 
						
							2016-01-30 20:23:14 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels 
								
							 
						 
						
							
							
							
							
								
							
							
								2468631dc9 
								
							 
						 
						
							
							
								
								overworked examples  
							
							
							
						 
						
							2016-01-26 20:07:03 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels 
								
							 
						 
						
							
							
							
							
								
							
							
								2b13711009 
								
							 
						 
						
							
							
								
								updated online version  
							
							
							
						 
						
							2016-01-24 23:02:28 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels 
								
							 
						 
						
							
							
							
							
								
							
							
								c09d03fba7 
								
							 
						 
						
							
							
								
								fixed documentation  
							
							
							
						 
						
							2016-01-24 22:43:00 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels 
								
							 
						 
						
							
							
							
							
								
							
							
								a04bd4f851 
								
							 
						 
						
							
							
								
								cleanup after  #184  
							
							
							
						 
						
							2016-01-20 21:14:58 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									dariomt 
								
							 
						 
						
							
							
							
							
								
							
							
								e1645a09e9 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/nlohmann/json  
							
							
							
						 
						
							2016-01-18 10:08:58 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels 
								
							 
						 
						
							
							
							
							
								
							
							
								67c2d90a21 
								
							 
						 
						
							
							
								
								working on  #160  
							
							
							
						 
						
							2015-12-22 13:27:40 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels 
								
							 
						 
						
							
							
							
							
								
							
							
								4351698c83 
								
							 
						 
						
							
							
								
								re-adding const version operator[] ( #135 ,  #159 )  
							
							... 
							
							
							
							It was a good idea to implement a const version of operator[] it in the
first place. I was a pity that this implementation was flawed. It was a
mistake to remove the const version completely. This commit
re-introduces the const version. My apologies for all the inconvenience. 
							
						 
						
							2015-12-21 08:42:42 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels 
								
							 
						 
						
							
							
							
							
								
							
							
								cd04a7d3e9 
								
							 
						 
						
							
							
								
								fix for  #133  
							
							... 
							
							
							
							added value() function to get object value at given key or a default
value if key does not exist 
							
						 
						
							2015-12-15 08:38:54 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									dariomt 
								
							 
						 
						
							
							
							
							
								
							
							
								bd2783f45c 
								
							 
						 
						
							
							
								
								Added get_ref()  
							
							... 
							
							
							
							Same as get_ptr() but for references.
If the type is incompatible it throws (get_ptr() returns null).
Implemented in terms of get_ptr(). 
							
						 
						
							2015-10-16 15:23:57 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels 
								
							 
						 
						
							
							
							
							
								
							
							
								57de1d602e 
								
							 
						 
						
							
							
								
								Cleanup  
							
							
							
						 
						
							2015-10-03 13:16:59 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Dario Menendez 
								
							 
						 
						
							
							
							
							
								
							
							
								260745810d 
								
							 
						 
						
							
							
								
								fixed typos in comments for examples  
							
							
							
						 
						
							2015-10-02 15:57:40 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels 
								
							 
						 
						
							
							
							
							
								
							
							
								1c8d5dc211 
								
							 
						 
						
							
							
								
								added another insert function  
							
							
							
						 
						
							2015-07-12 22:47:08 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels 
								
							 
						 
						
							
							
							
							
								
							
							
								186aefb8f2 
								
							 
						 
						
							
							
								
								added first insert functions  
							
							
							
						 
						
							2015-07-12 18:28:23 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels 
								
							 
						 
						
							
							
							
							
								
							
							
								b2efd50a03 
								
							 
						 
						
							
							
								
								more documentation  
							
							
							
						 
						
							2015-07-12 17:08:51 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels 
								
							 
						 
						
							
							
							
							
								
							
							
								c012b29ae5 
								
							 
						 
						
							
							
								
								worked on  #102 : more documentation and examples  
							
							
							
						 
						
							2015-07-08 16:55:29 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels 
								
							 
						 
						
							
							
							
							
								
							
							
								abd741708d 
								
							 
						 
						
							
							
								
								more tests  
							
							
							
						 
						
							2015-06-30 00:12:18 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels 
								
							 
						 
						
							
							
							
							
								
							
							
								55fe3807c9 
								
							 
						 
						
							
							
								
								small README fix  
							
							
							
						 
						
							2015-06-29 23:20:33 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels 
								
							 
						 
						
							
							
							
							
								
							
							
								5ae2babf61 
								
							 
						 
						
							
							
								
								add online examples  
							
							
							
						 
						
							2015-06-29 23:02:41 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels 
								
							 
						 
						
							
							
							
							
								
							
							
								48c4f4d05d 
								
							 
						 
						
							
							
								
								more documentation  
							
							
							
						 
						
							2015-06-28 19:32:09 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels 
								
							 
						 
						
							
							
							
							
								
							
							
								7d9cfb1b32 
								
							 
						 
						
							
							
								
								added documentation for erase functions  
							
							
							
						 
						
							2015-06-28 15:49:40 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels 
								
							 
						 
						
							
							
							
							
								
							
							
								c58c5aa8c9 
								
							 
						 
						
							
							
								
								fixed   #97  
							
							... 
							
							
							
							- added functions is_structured() and is_primitive()
- updated documentation
- updated test cases 
							
						 
						
							2015-06-27 18:43:11 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels 
								
							 
						 
						
							
							
							
							
								
							
							
								3ffedea5c4 
								
							 
						 
						
							
							
								
								minor changes  
							
							
							
						 
						
							2015-06-25 00:40:16 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels 
								
							 
						 
						
							
							
							
							
								
							
							
								40312fb07b 
								
							 
						 
						
							
							
								
								worked on  #91  
							
							... 
							
							
							
							- implemented `get_ptr` function to return pointer to value member
- overworked `get` function to support pointer types
- added test cases
- added documentation (see
http://nlohmann.github.io/json/classnlohmann_1_1basic__json.html ) with
examples 
							
						 
						
							2015-06-24 15:16:32 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels 
								
							 
						 
						
							
							
							
							
								
							
							
								457572184c 
								
							 
						 
						
							
							
								
								more documentation  
							
							... 
							
							
							
							In this commit, also the semantics for values skipped via the parser
callback has changed. Now, the top-level value is returned as “null”
instead of “discarded”. 
							
						 
						
							2015-06-24 12:15:51 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels 
								
							 
						 
						
							
							
							
							
								
							
							
								48545f5b18 
								
							 
						 
						
							
							
								
								more documentation  
							
							
							
						 
						
							2015-06-22 23:21:49 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels 
								
							 
						 
						
							
							
							
							
								
							
							
								844bfd39b5 
								
							 
						 
						
							
							
								
								more documentation  
							
							
							
						 
						
							2015-06-22 21:44:20 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels 
								
							 
						 
						
							
							
							
							
								
							
							
								c85dbef98f 
								
							 
						 
						
							
							
								
								more documentation  
							
							
							
						 
						
							2015-06-21 22:42:32 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels 
								
							 
						 
						
							
							
							
							
								
							
							
								91c330ae01 
								
							 
						 
						
							
							
								
								reorganized repo  
							
							
							
						 
						
							2015-06-21 21:24:03 +02:00