Niels Lohmann
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								4912231450
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into feature/issue698
							
							
							
							
							
						 | 
						
							2017-10-02 18:25:25 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								b91805e1f0
								
							
						 | 
						
							
							
								
								🚨 removing a compiler warning #755
							
							
							
							
							
						 | 
						
							2017-10-02 18:11:36 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								f89f8b2d0b
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into feature/issue698
							
							
							
							
							
						 | 
						
							2017-10-02 17:47:53 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								8be303d4fb
								
							
						 | 
						
							
							
								
								🏁 fixing a min() call for MSVC #762
							
							
							
							
							
						 | 
						
							2017-10-02 13:54:14 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								1df836ce40
								
							
						 | 
						
							
							
								
								⏪ removed call to std::signbit #761
							
							
							
							
							
						 | 
						
							2017-10-01 15:48:29 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								8af49d4be5
								
							
						 | 
						
							
							
								
								🚨 removing compiler warnings #755
							
							
							
							
							
						 | 
						
							2017-09-30 11:00:26 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								1a66527dca
								
							
						 | 
						
							
							
								
								📝 fixed documentation #745
							
							
							
							
							
						 | 
						
							2017-09-30 10:18:18 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
							
							
								
							
							
								b05ea3de55
								
							
						 | 
						
							
							
								
								Merge pull request #753 from gregmarr/patch-1
							
							
							
							
							
							
							
							Add info for the vcpkg package. 
							
						 | 
						
							2017-09-26 22:36:36 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									gregmarr
								
							 
						 | 
						
							
							
							
							
								
							
							
								ec60ff3451
								
							
						 | 
						
							
							
								
								Add info for the vcpkg package.
							
							
							
							
							
						 | 
						
							2017-09-26 08:39:38 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								647711fad1
								
							
						 | 
						
							
							
								
								✅ improved test coverage
							
							
							
							
							
						 | 
						
							2017-09-14 17:31:28 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								737816d0cd
								
							
						 | 
						
							
							
								
								👷 another try with Travis
							
							
							
							
							
						 | 
						
							2017-09-14 17:31:14 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								e75adc21a5
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into feature/issue698
							
							
							
							
							
						 | 
						
							2017-09-13 18:57:25 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								b90529c36d
								
							
						 | 
						
							
							
								
								✅ improved test coverage
							
							
							
							
							
						 | 
						
							2017-09-13 18:56:54 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								82c93680d1
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into feature/issue698
							
							
							
							
							
						 | 
						
							2017-09-10 22:38:23 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								e2e0ecd867
								
							
						 | 
						
							
							
								
								✅ improved test coverage
							
							
							
							
							
						 | 
						
							2017-09-10 22:38:04 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								248db1e423
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into feature/issue698
							
							
							
							
							
						 | 
						
							2017-09-10 11:42:57 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								7410763731
								
							
						 | 
						
							
							
								
								✅ improved test coverage
							
							
							
							
							
						 | 
						
							2017-09-10 11:42:43 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								cafc2d057a
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into feature/issue698
							
							
							
							
							
						 | 
						
							2017-09-10 10:22:10 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								da97cf7895
								
							
						 | 
						
							
							
								
								✅ improved test coverage
							
							
							
							
							
						 | 
						
							2017-09-10 10:21:53 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								295d65ada7
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into feature/issue698
							
							
							
							
							
						 | 
						
							2017-09-10 01:13:43 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								fcba9ec537
								
							
						 | 
						
							
							
								
								🔨 clean up
							
							
							
							
							
						 | 
						
							2017-09-10 01:12:03 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								41994ba028
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into feature/issue698
							
							
							
							
							
						 | 
						
							2017-09-09 16:53:37 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								b21d7810fa
								
							
						 | 
						
							
							
								
								✅ improved test coverage
							
							
							
							
							
						 | 
						
							2017-09-09 16:53:27 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								c1d6478584
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into feature/issue698
							
							
							
							
							
						 | 
						
							2017-09-09 13:07:40 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								9ae6796a38
								
							
						 | 
						
							
							
								
								✅ improved test coverage
							
							
							
							
							
						 | 
						
							2017-09-09 13:07:10 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								31ce7e1e59
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into feature/issue698
							
							
							
							
							
						 | 
						
							2017-09-09 11:05:20 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								fd250ae2b1
								
							
						 | 
						
							
							
								
								✅ improved test coverage
							
							
							
							
							
						 | 
						
							2017-09-09 11:04:58 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								5c08b84dec
								
							
						 | 
						
							
							
								
								⏪ back to previous MSVC 2017
							
							
							
							
							
						 | 
						
							2017-09-06 18:26:52 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								da14286abb
								
							
						 | 
						
							
							
								
								👷 try to use MSVC 2017 again
							
							
							
							
							
						 | 
						
							2017-09-06 18:13:35 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								c607b5c2ac
								
							
						 | 
						
							
							
								
								📝 improved documentation
							
							
							
							
							
						 | 
						
							2017-09-06 17:14:06 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								91e0032853
								
							
						 | 
						
							
							
								
								📝 improved documentation
							
							
							
							
							
						 | 
						
							2017-08-29 23:46:26 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								b41b13047c
								
							
						 | 
						
							
							
								
								👷 removed unneccessary test
							
							
							
							
							
						 | 
						
							2017-08-27 11:30:36 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								15e757c42b
								
							
						 | 
						
							
							
								
								🔨 trying to fix memory issue with valarray
							
							
							
							
							
						 | 
						
							2017-08-27 10:41:39 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								0e94ba8857
								
							
						 | 
						
							
							
								
								👷 using the same compilers
							
							
							
							
							
						 | 
						
							2017-08-26 08:56:34 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								4f5c345817
								
							
						 | 
						
							
							
								
								👷 run sanitizer another time to check if it works
							
							
							
							
							
						 | 
						
							2017-08-26 08:20:37 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								8608f42187
								
							
						 | 
						
							
							
								
								👷 trying to use libstdc++
							
							
							
							
							
							
							
							https://github.com/travis-ci/apt-source-whitelist/issues/372#issuecomment-320547215 
							
						 | 
						
							2017-08-25 22:49:18 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								5e7acbf05e
								
							
						 | 
						
							
							
								
								👷 adjusted flags for Clang sanitizer
							
							
							
							
							
							
							
							we are overrding the CXXFLAGS provided by travis in order to use gcc's libstdc++ 
							
						 | 
						
							2017-08-25 22:34:00 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								268f5a3d0a
								
							
						 | 
						
							
							
								
								👷 added option to switch off exceptions
							
							
							
							
							
						 | 
						
							2017-08-25 21:29:27 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								839681ff9f
								
							
						 | 
						
							
							
								
								👷 using Ninja
							
							
							
							
							
						 | 
						
							2017-08-25 21:01:07 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								3dcd360139
								
							
						 | 
						
							
							
								
								👷 adding status messages
							
							
							
							
							
						 | 
						
							2017-08-25 20:19:58 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								05b97c473a
								
							
						 | 
						
							
							
								
								👷 added flags for Valgrind and Clang sanitizer
							
							
							
							
							
						 | 
						
							2017-08-25 20:12:21 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								c87b080cc5
								
							
						 | 
						
							
							
								
								👷 new cmake file for test cases
							
							
							
							
							
						 | 
						
							2017-08-25 18:06:22 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
							
							
								
							
							
								5b71bf09a1
								
							
						 | 
						
							
							
								
								Merge pull request #708 from theodelrieu/fix/from_json_tuple_pair
							
							
							
							
							
							
							
							fix from_json implementation for pair/tuple 
							
						 | 
						
							2017-08-24 12:40:16 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Théo DELRIEU
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								bb1b4c934e
								
							
						 | 
						
							
							
								
								fix from_json implementation for pair/tuple
							
							
							
							
							
							
							
							Introduced by 6e4910d5c5
Fixes #707 
							
						 | 
						
							2017-08-23 10:05:43 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								e45eaf6e30
								
							
						 | 
						
							
							
								
								Revert "👷 using libc++ with Clang"
							
							
							
							
							
							
							
							This reverts commit 41b2c69bdb. 
							
						 | 
						
							2017-08-23 08:39:19 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								0b5e8f859b
								
							
						 | 
						
							
							
								
								🔨 cleanup
							
							
							
							
							
							
							
							Fixed some warning in Clion. 
							
						 | 
						
							2017-08-23 00:42:15 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								9fd031b6f4
								
							
						 | 
						
							
							
								
								🐛 re-added support for std::valarray #702
							
							
							
							
							
						 | 
						
							2017-08-22 23:28:23 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								41b2c69bdb
								
							
						 | 
						
							
							
								
								👷 using libc++ with Clang
							
							
							
							
							
						 | 
						
							2017-08-22 22:04:38 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								cd53790993
								
							
						 | 
						
							
							
								
								👷 using Clang 5.0
							
							
							
							
							
						 | 
						
							2017-08-21 20:03:24 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Niels Lohmann
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								e569b9736b
								
							
						 | 
						
							
							
								
								👷 trying to fix build error
							
							
							
							
							
							
							
							See http://help.appveyor.com/discussions/problems/7450-build-error-on-vs-2017-image-suddenly. 
							
						 | 
						
							2017-08-21 17:31:14 +02:00 | 
						
						
							
							
							
							
								
							
							
						 |