Michael Macnair 
								
							 
						 
						
							
							
							
							
								
							
							
								9e500b49ac 
								
							 
						 
						
							
							
								
								Add support for afl-fuzz testing  
							
							... 
							
							
							
							"make fuzz" creates a simple executable that de-serialises stdin
and re-serialises to stdout.
"make fuzz_testcases" extracts the smaller json test cases into
a testcases directory.
The library can then be fuzzed as follows:
    CC=afl-clang-fast make fuzz
    make fuzz_testcases
    mkdir out
    afl-fuzz -i testcases -o out ./fuzz 
							
						 
						
							2016-02-12 09:35:08 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels 
								
							 
						 
						
							
							
							
							
								
							
							
								8b1a777d36 
								
							 
						 
						
							
							
								
								reverted change wrt. Erasable concept  
							
							
							
						 
						
							2016-02-05 22:37:28 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels 
								
							 
						 
						
							
							
							
							
								
							
							
								2ff2e10660 
								
							 
						 
						
							
							
								
								checking Erasable concept  
							
							
							
						 
						
							2016-02-05 22:30:37 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels 
								
							 
						 
						
							
							
							
							
								
							
							
								2c720b26ab 
								
							 
						 
						
							
							
								
								added a constructor from an input stream  
							
							
							
						 
						
							2016-02-05 19:24:42 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels 
								
							 
						 
						
							
							
							
							
								
							
							
								104c4b5286 
								
							 
						 
						
							
							
								
								improve code coverage  
							
							
							
						 
						
							2016-01-31 15:04:38 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels 
								
							 
						 
						
							
							
							
							
								
							
							
								22127a4b85 
								
							 
						 
						
							
							
								
								moved documentation to index markdown file  
							
							
							
						 
						
							2016-01-30 22:05:01 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Trevor Welsby 
								
							 
						 
						
							
							
							
							
								
							
							
								561accb068 
								
							 
						 
						
							
							
								
								Fixed issue  #199  
							
							
							
						 
						
							2016-01-30 12:41:12 +10:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels 
								
							 
						 
						
							
							
							
							
								
							
							
								707732a53e 
								
							 
						 
						
							
							
								
								clean up after  #193  
							
							
							
						 
						
							2016-01-26 19:50:49 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels 
								
							 
						 
						
							
							
							
							
								
							
							
								e46cc6327f 
								
							 
						 
						
							
							
								
								Merge pull request  #193  from twelsby/issue178  
							
							... 
							
							
							
							Issue #178  - Extending support to full uint64_t/int64_t range and unsigned type (updated) 
							
						 
						
							2016-01-26 19:40:16 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Trevor Welsby 
								
							 
						 
						
							
							
							
							
								
							
							
								a4a88b1b7d 
								
							 
						 
						
							
							
								
								Issue  #195  - update Travis to Trusty due to gcc/clang strtod() bug  
							
							
							
						 
						
							2016-01-26 08:36:18 +10:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Trevor Welsby 
								
							 
						 
						
							
							
							
							
								
							
							
								281492c581 
								
							 
						 
						
							
							
								
								Merge upstream commits and resolve conflicts  
							
							
							
						 
						
							2016-01-25 02:42:20 +10:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels 
								
							 
						 
						
							
							
							
							
								
							
							
								54a4139157 
								
							 
						 
						
							
							
								
								cleanup after  #191  
							
							
							
						 
						
							2016-01-24 17:33:46 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Trevor Welsby 
								
							 
						 
						
							
							
							
							
								
							
							
								4620960b72 
								
							 
						 
						
							
							
								
								Disable problematic test for GCC/clang, remove debug dump from unit.cpp  
							
							
							
						 
						
							2016-01-25 02:22:46 +10:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Trevor Welsby 
								
							 
						 
						
							
							
							
							
								
							
							
								19918b948d 
								
							 
						 
						
							
							
								
								Fix typo in preprocessor defined/!defined  
							
							
							
						 
						
							2016-01-25 02:07:49 +10:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Trevor Welsby 
								
							 
						 
						
							
							
							
							
								
							
							
								421affd06e 
								
							 
						 
						
							
							
								
								Merge upstream commits and resolve conflicts  
							
							
							
						 
						
							2016-01-25 02:01:01 +10:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Trevor Welsby 
								
							 
						 
						
							
							
							
							
								
							
							
								4d6985d4e2 
								
							 
						 
						
							
							
								
								Disable problematic test for GCC/clang, remove debug dump from unit.cpp  
							
							
							
						 
						
							2016-01-25 01:53:32 +10:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Trevor Welsby 
								
							 
						 
						
							
							
							
							
								
							
							
								d7ef2ccffd 
								
							 
						 
						
							
							
								
								Issue  #178  - fully support int64_t/uint64_t numbers, add unsigned type  
							
							
							
						 
						
							2016-01-25 01:04:37 +10:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels 
								
							 
						 
						
							
							
							
							
								
							
							
								8a0490a011 
								
							 
						 
						
							
							
								
								cleanup  
							
							
							
						 
						
							2016-01-24 13:04:55 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels 
								
							 
						 
						
							
							
							
							
								
							
							
								e00b00fea8 
								
							 
						 
						
							
							
								
								Merge pull request  #190  from twelsby/issue185  
							
							... 
							
							
							
							fixed  #185  - remove approx() and use #pragma to kill warnings 
						
							2016-01-24 12:55:40 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels 
								
							 
						 
						
							
							
							
							
								
							
							
								600ad330c5 
								
							 
						 
						
							
							
								
								cleanup after PR  #189  
							
							
							
						 
						
							2016-01-24 11:00:54 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Trevor Welsby 
								
							 
						 
						
							
							
							
							
								
							
							
								f79d52b973 
								
							 
						 
						
							
							
								
								DEBUG ONLY: DUMP INFO FROM TRAVIS  
							
							
							
						 
						
							2016-01-24 19:15:30 +10:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Trevor Welsby 
								
							 
						 
						
							
							
							
							
								
							
							
								a1c6f16bd3 
								
							 
						 
						
							
							
								
								Fix Issue  #186  - add overload wrappers for strto(f|d|ld)  
							
							
							
						 
						
							2016-01-24 17:00:11 +10:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Trevor Welsby 
								
							 
						 
						
							
							
							
							
								
							
							
								3a1403409f 
								
							 
						 
						
							
							
								
								Issue  #185  - remove approx() and use #pragma to kill warnings  
							
							
							
						 
						
							2016-01-23 17:45:30 +10:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Trevor Welsby 
								
							 
						 
						
							
							
							
							
								
							
							
								bd0f3001c6 
								
							 
						 
						
							
							
								
								Fix typo in new unit.hpp comments  
							
							
							
						 
						
							2016-01-23 17:31:58 +10:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Trevor Welsby 
								
							 
						 
						
							
							
							
							
								
							
							
								7e3245786c 
								
							 
						 
						
							
							
								
								Fixed issue  #171  - added extra operator[] template overloads  
							
							
							
						 
						
							2016-01-23 17:03:45 +10: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 
								
							 
						 
						
							
							
							
							
								
							
							
								7371c71d2a 
								
							 
						 
						
							
							
								
								using CHECK_THROWS_WITH to check exceptions ( #160 )  
							
							
							
						 
						
							2015-12-27 15:30:30 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels 
								
							 
						 
						
							
							
							
							
								
							
							
								d6b8830e03 
								
							 
						 
						
							
							
								
								more work on exceptions ( #160 )  
							
							
							
						 
						
							2015-12-26 13:17:32 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels 
								
							 
						 
						
							
							
							
							
								
							
							
								dc8ab92552 
								
							 
						 
						
							
							
								
								more tests for exceptions ( #160 )  
							
							
							
						 
						
							2015-12-25 13:04:40 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels 
								
							 
						 
						
							
							
							
							
								
							
							
								76e5e29eda 
								
							 
						 
						
							
							
								
								overworked exceptions and tests ( #160 )  
							
							
							
						 
						
							2015-12-25 11:46:18 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels 
								
							 
						 
						
							
							
							
							
								
							
							
								70493a10d1 
								
							 
						 
						
							
							
								
								iterator_wrapper for const objects ( #83 )  
							
							
							
						 
						
							2015-12-23 08:21:29 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels 
								
							 
						 
						
							
							
							
							
								
							
							
								00f9296db5 
								
							 
						 
						
							
							
								
								some cleanup for  #83  
							
							
							
						 
						
							2015-12-22 18:07:51 +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 
								
							 
						 
						
							
							
							
							
								
							
							
								9def0186be 
								
							 
						 
						
							
							
								
								upgraded Catch to v1.3.1  
							
							
							
						 
						
							2015-12-20 15:42:01 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels 
								
							 
						 
						
							
							
							
							
								
							
							
								457bfc2401 
								
							 
						 
						
							
							
								
								work on  #144  
							
							
							
						 
						
							2015-12-20 15:30:07 +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 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels 
								
							 
						 
						
							
							
							
							
								
							
							
								258f04c561 
								
							 
						 
						
							
							
								
								fixed   #154  (no more warnings for incomplete switches)  
							
							
							
						 
						
							2015-12-14 16:32:37 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels 
								
							 
						 
						
							
							
							
							
								
							
							
								a70a7a8001 
								
							 
						 
						
							
							
								
								fixed   #135 : operator[] now only works on nonconst JSON objects  
							
							
							
						 
						
							2015-12-13 11:26:55 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels 
								
							 
						 
						
							
							
							
							
								
							
							
								9da8770f3a 
								
							 
						 
						
							
							
								
								ignore UTF-8 byte order mark ( fixes   #152 )  
							
							
							
						 
						
							2015-12-07 22:27:53 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Robert Marki 
								
							 
						 
						
							
							
							
							
								
							
							
								ec7a1d8347 
								
							 
						 
						
							
							
								
								Fix character skipping after a surrogate pair  
							
							... 
							
							
							
							In a string the first character following a surrogate pair is skipped by the
lexer, but the rest of the string is parsed as usual. 
							
						 
						
							2015-11-13 13:13:46 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels 
								
							 
						 
						
							
							
							
							
								
							
							
								746c1a7142 
								
							 
						 
						
							
							
								
								cleanup  
							
							
							
						 
						
							2015-10-17 12:51:59 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									dariomt 
								
							 
						 
						
							
							
							
							
								
							
							
								4b8a822f33 
								
							 
						 
						
							
							
								
								Merge branch 'get_ref'  
							
							
							
						 
						
							2015-10-16 16:42:03 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									dariomt 
								
							 
						 
						
							
							
							
							
								
							
							
								04cc7d5a05 
								
							 
						 
						
							
							
								
								doh! disable test correctly only for MSVC  
							
							
							
						 
						
							2015-10-16 16:36:34 +02: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 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									dariomt 
								
							 
						 
						
							
							
							
							
								
							
							
								9d45aafc2c 
								
							 
						 
						
							
							
								
								disabled "CopyAssignable" test for MSVC in Debug mode, see  #125  
							
							... 
							
							
							
							STL iterators used by json::iterator don't pass this test in Debug mode.
The test does pass in Release mode, so I felt the best thing to do was selectively disable that test. 
							
						 
						
							2015-10-07 18:31:08 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels 
								
							 
						 
						
							
							
							
							
								
							
							
								b58a93b8dd 
								
							 
						 
						
							
							
								
								merged  #111  
							
							
							
						 
						
							2015-08-14 14:45:13 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels 
								
							 
						 
						
							
							
							
							
								
							
							
								fadccc34eb 
								
							 
						 
						
							
							
								
								fixed iterator_wrapper  
							
							
							
						 
						
							2015-08-13 10:08:55 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels 
								
							 
						 
						
							
							
							
							
								
							
							
								66ec58639b 
								
							 
						 
						
							
							
								
								removed failing tests  
							
							
							
						 
						
							2015-08-06 23:02:52 +02:00