Niels
								
							 
						 | 
						
							
							
							
							
								
							
							
								693bfe439b
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into feature/emplace
							
							
							
							
							
						 | 
						
							2016-11-16 19:16:16 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels
								
							 
						 | 
						
							
							
							
							
								
							
							
								0d72767b3e
								
							
						 | 
						
							
							
								
								⬆️ updated to Catch v1.5.8
							
							
							
							
							
						 | 
						
							2016-11-16 19:15:54 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels
								
							 
						 | 
						
							
							
							
							
								
							
							
								56667af823
								
							
						 | 
						
							
							
								
								🎨 stating the name of the library in the license
							
							
							
							
							
						 | 
						
							2016-11-16 19:08:25 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels
								
							 
						 | 
						
							
							
							
							
								
							
							
								b0f896558f
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into feature/emplace
							
							
							
							
							
						 | 
						
							2016-11-16 09:04:25 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels
								
							 
						 | 
						
							
							
							
							
								
							
							
								425b9834a8
								
							
						 | 
						
							
							
								
								🐛 removed the wrong compiler
							
							
							
							
							
						 | 
						
							2016-11-16 08:25:08 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels
								
							 
						 | 
						
							
							
							
							
								
							
							
								56671a88c6
								
							
						 | 
						
							
							
								
								🍎 removed Xcode 8.0 due to repeated problems
							
							
							
							
							
						 | 
						
							2016-11-16 08:01:48 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels
								
							 
						 | 
						
							
							
							
							
								
							
							
								5316f0fff2
								
							
						 | 
						
							
							
								
								🍎 added Xcode 8.1 build for travis
							
							
							
							
							
						 | 
						
							2016-11-16 06:42:26 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels
								
							 
						 | 
						
							
							
							
							
								
							
							
								1be73b903e
								
							
						 | 
						
							
							
								
								proposal for emplace/emplace_back (#349)
							
							
							
							
							
						 | 
						
							2016-11-11 19:29:14 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels
								
							 
						 | 
						
							
							
							
							
								
							
							
								9ca00e4880
								
							
						 | 
						
							
							
								
								readded missing header
							
							
							
							
							
						 | 
						
							2016-11-03 07:27:32 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels
								
							 
						 | 
						
							
							
							
							
								
							
							
								e385417047
								
							
						 | 
						
							
							
								
								documented and cleaned up headers (#314)
							
							
							
							
							
						 | 
						
							2016-11-02 21:27:19 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels
								
							 
						 | 
						
							
							
							
							
								
							
							
								6d2b5e3771
								
							
						 | 
						
							
							
								
								Merge branch 'release/2.0.7' into develop
							
							
							
							
							
						 | 
						
							2016-11-02 20:52:42 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels
								
							 
						 | 
						
							
							
							
							
								
							
							
								700977d73e
								
							
						 | 
						
							
							
								
								version bump
							
							
							
							
							
						 | 
						
							2016-11-02 20:52:15 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels
								
							 
						 | 
						
							
							
							
							
								
							
							
								79015b9d0a
								
							
						 | 
						
							
							
								
								Merge branch 'feature/jsontestsuite' into develop
							
							
							
							
							
						 | 
						
							2016-11-02 17:03:17 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels
								
							 
						 | 
						
							
							
							
							
								
							
							
								3716a2fbe8
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into feature/jsontestsuite
							
							
							
							
							
						 | 
						
							2016-11-02 17:03:12 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels
								
							 
						 | 
						
							
							
							
							
								
							
							
								737d43724f
								
							
						 | 
						
							
							
								
								Merge branch 'feature/issue329' into develop
							
							
							
							
							
						 | 
						
							2016-11-02 16:59:23 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels
								
							 
						 | 
						
							
							
							
							
								
							
							
								59c8343851
								
							
						 | 
						
							
							
								
								cleanup
							
							
							
							
							
						 | 
						
							2016-11-02 15:44:46 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels
								
							 
						 | 
						
							
							
							
							
								
							
							
								94c16b2c31
								
							
						 | 
						
							
							
								
								fixed coverage
							
							
							
							
							
						 | 
						
							2016-11-01 17:01:04 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels
								
							 
						 | 
						
							
							
							
							
								
							
							
								8f70525374
								
							
						 | 
						
							
							
								
								more test coverage
							
							
							
							
							
						 | 
						
							2016-10-30 17:46:00 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels
								
							 
						 | 
						
							
							
							
							
								
							
							
								7adccde714
								
							
						 | 
						
							
							
								
								improved coverage and updated README
							
							
							
							
							
						 | 
						
							2016-10-30 17:10:11 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels
								
							 
						 | 
						
							
							
							
							
								
							
							
								8d1e65f297
								
							
						 | 
						
							
							
								
								evaluated i-tests (#344)
							
							
							
							
							
						 | 
						
							2016-10-30 16:07:17 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels
								
							 
						 | 
						
							
							
							
							
								
							
							
								7b4e6cf705
								
							
						 | 
						
							
							
								
								added implementation-specific tests (#344)
							
							
							
							
							
						 | 
						
							2016-10-30 12:08:29 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels
								
							 
						 | 
						
							
							
							
							
								
							
							
								a8136c578a
								
							
						 | 
						
							
							
								
								fixed BOM handling #344
							
							
							
							
							
						 | 
						
							2016-10-29 21:08:30 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels
								
							 
						 | 
						
							
							
							
							
								
							
							
								b820bb3b1f
								
							
						 | 
						
							
							
								
								fixed a lot of unicode errors (#344)
							
							
							
							
							
							
							
							BOMs currently yield an error. 
							
						 | 
						
							2016-10-29 19:35:17 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels
								
							 
						 | 
						
							
							
							
							
								
							
							
								b03bbe724d
								
							
						 | 
						
							
							
								
								added n test cases (#344)
							
							
							
							
							
						 | 
						
							2016-10-29 14:02:33 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels
								
							 
						 | 
						
							
							
							
							
								
							
							
								7da182472d
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into feature/jsontestsuite
							
							
							
							
							
						 | 
						
							2016-10-29 13:37:17 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels
								
							 
						 | 
						
							
							
							
							
								
							
							
								42ea4fb751
								
							
						 | 
						
							
							
								
								fixed a bug for short input files (#344)
							
							
							
							
							
							
							
							For input files with less than 5 bytes, the parser had a bug so that
refilling the input buffer led to erasing it. 
							
						 | 
						
							2016-10-29 13:32:36 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels
								
							 
						 | 
						
							
							
							
							
								
							
							
								2fdba9de19
								
							
						 | 
						
							
							
								
								added "y" cases
							
							
							
							
							
						 | 
						
							2016-10-26 23:45:11 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels
								
							 
						 | 
						
							
							
							
							
								
							
							
								a2808322c6
								
							
						 | 
						
							
							
								
								add test files from https://github.com/nst/JSONTestSuite
							
							
							
							
							
						 | 
						
							2016-10-26 18:57:56 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
							
							
								
							
							
								a29fcae409
								
							
						 | 
						
							
							
								
								fixed Cmake link
							
							
							
							
							
						 | 
						
							2016-10-26 09:20:40 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels
								
							 
						 | 
						
							
							
							
							
								
							
							
								3ebe28970a
								
							
						 | 
						
							
							
								
								small fixes
							
							
							
							
							
						 | 
						
							2016-10-23 17:25:07 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels
								
							 
						 | 
						
							
							
							
							
								
							
							
								79d9fdc016
								
							
						 | 
						
							
							
								
								user-defined string literals exploit string length (#340)
							
							
							
							
							
						 | 
						
							2016-10-22 18:57:58 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels
								
							 
						 | 
						
							
							
							
							
								
							
							
								e310850353
								
							
						 | 
						
							
							
								
								cleanup after #336
							
							
							
							
							
						 | 
						
							2016-10-16 23:46:24 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
							
							
								
							
							
								8057782bb8
								
							
						 | 
						
							
							
								
								Merge pull request #336 from seeekr/patch-1
							
							
							
							
							
							
							
							fix minor grammar/style issue in README.md 
							
						 | 
						
							2016-10-16 23:40:17 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Denis Andrejew
								
							 
						 | 
						
							
							
							
							
								
							
							
								cb2d41e3a0
								
							
						 | 
						
							
							
								
								fix minor grammar/style issue in README.md
							
							
							
							
							
						 | 
						
							2016-10-16 02:46:43 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels
								
							 
						 | 
						
							
							
							
							
								
							
							
								542a48a16a
								
							
						 | 
						
							
							
								
								Merge branch 'release/2.0.6' into develop
							
							
							
							
							
						 | 
						
							2016-10-15 16:48:08 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels
								
							 
						 | 
						
							
							
							
							
								
							
							
								606098f45d
								
							
						 | 
						
							
							
								
								release 2.0.6
							
							
							
							
							
						 | 
						
							2016-10-15 16:47:45 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels
								
							 
						 | 
						
							
							
							
							
								
							
							
								d91067220f
								
							
						 | 
						
							
							
								
								added missing overflow check for #329
							
							
							
							
							
						 | 
						
							2016-10-13 21:00:48 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels
								
							 
						 | 
						
							
							
							
							
								
							
							
								67b9f1936d
								
							
						 | 
						
							
							
								
								cleanup after closing #324
							
							
							
							
							
						 | 
						
							2016-10-12 22:05:45 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
							
							
								
							
							
								bb9d87ad55
								
							
						 | 
						
							
							
								
								Merge pull request #324 from vpetrigo/has_mapped_improve
							
							
							
							
							
							
							
							make has_mapped_type struct friendly 
							
						 | 
						
							2016-10-12 21:59:56 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels
								
							 
						 | 
						
							
							
							
							
								
							
							
								e7a60d8961
								
							
						 | 
						
							
							
								
								Merge branch 'feature/issue323' into develop
							
							
							
							
							
						 | 
						
							2016-10-12 21:21:59 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels
								
							 
						 | 
						
							
							
							
							
								
							
							
								470197bd0b
								
							
						 | 
						
							
							
								
								improve test coverage
							
							
							
							
							
						 | 
						
							2016-10-10 21:58:31 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels
								
							 
						 | 
						
							
							
							
							
								
							
							
								d3e7f9da67
								
							
						 | 
						
							
							
								
								code cleanup for #323
							
							
							
							
							
						 | 
						
							2016-10-10 20:38:50 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels
								
							 
						 | 
						
							
							
							
							
								
							
							
								97280bbcfc
								
							
						 | 
						
							
							
								
								added missing header
							
							
							
							
							
						 | 
						
							2016-10-09 16:32:01 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Vladimir Petrigo
								
							 
						 | 
						
							
							
							
							
								
							
							
								e9fde3e116
								
							
						 | 
						
							
							
								
								make has_mapped_type struct friendly
							
							
							
							
							
						 | 
						
							2016-10-08 16:50:23 +03:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels
								
							 
						 | 
						
							
							
							
							
								
							
							
								54bf5f20e9
								
							
						 | 
						
							
							
								
								adjusted README
							
							
							
							
							
						 | 
						
							2016-10-08 14:33:10 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels
								
							 
						 | 
						
							
							
							
							
								
							
							
								2fa8ea0f74
								
							
						 | 
						
							
							
								
								started fixing #323
							
							
							
							
							
						 | 
						
							2016-10-08 14:27:28 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels
								
							 
						 | 
						
							
							
							
							
								
							
							
								a0ef5a194c
								
							
						 | 
						
							
							
								
								addressed #319, #321, and #318
							
							
							
							
							
						 | 
						
							2016-10-06 23:27:43 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
							
							
								
							
							
								04b11d78ff
								
							
						 | 
						
							
							
								
								Merge pull request #318 from ChristophJud/include_dir_relocation
							
							
							
							
							
							
							
							Include dir relocation 
							
						 | 
						
							2016-10-06 22:35:36 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
							
							
								
							
							
								8173c370f6
								
							
						 | 
						
							
							
								
								Merge pull request #321 from vasild/develop
							
							
							
							
							
							
							
							Fix usage examples' comments for std::multiset 
							
						 | 
						
							2016-10-06 22:33:58 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels
								
							 
						 | 
						
							
							
							
							
								
							
							
								b6550b35c3
								
							
						 | 
						
							
							
								
								fix after #313
							
							
							
							
							
						 | 
						
							2016-10-04 18:20:36 +02:00 | 
						
						
							
							
							
							
								
							
							
						 |