| 
								
								
									 Niels Lohmann | 4fb0795ec1 | 🚨 fix compiler warnings #2049 | 2020-04-19 13:01:36 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 3bc9e053c9 | Merge pull request #1969 from dota17/dota17-warning fix warnings in serializer.hpp for VS2019 | 2020-04-17 10:10:38 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 69ac336042 | Merge pull request #1967 from dota17/dota17-disable Fix C26451 warnnings in to_chars.hpp | 2020-04-17 10:08:21 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | f2b43a36b2 | Merge pull request #1662 from OmnipotentEntity/develop Add binary type support to all binary file formats, as well as an internally represented binary type | 2020-04-16 11:14:32 +02:00 |  | 
				
					
						| 
								
								
									 Michael Reilly | 012c9665ac | Add binary type support to all binary file formats, as well as an internally represented binary type | 2020-04-14 10:22:45 -04:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | dd04a32918 | 🐛 fix bug in diff function #1983 | 2020-04-13 14:35:36 +02:00 |  | 
				
					
						| 
								
								
									 chenguoping | f5a487d1b4 | fix issue1982: contains() exceptions are incorrectly raised | 2020-04-13 19:41:13 +08:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | b7be613b6e | Merge pull request #1990 from dota17/json_pointer catch exceptions for json_pointer : ..../+99 | 2020-04-13 13:29:33 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 84f19d6333 | Merge pull request #2034 from ArtemSarmini/gh-1920-gcc-10-incomplete-types Templatize basic_json constructor from json_ref | 2020-04-13 13:19:28 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | b0a3883081 | 🎨 fix format | 2020-04-13 13:11:26 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 3483d923d4 | Merge pull request #2033 from nlohmann/feature/issue1913 Replace deprecated std::is_pod | 2020-04-13 12:32:37 +02:00 |  | 
				
					
						| 
								
								
									 Artöm Bakri Al-Sarmini | 70be9751cd | typo fix | 2020-04-12 23:42:26 +03:00 |  | 
				
					
						| 
								
								
									 Artöm Bakri Al-Sarmini | ec955f08b4 | Templatize basic_json ctor from json_ref | 2020-04-12 22:32:39 +03:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 4396a68d2d | Merge pull request #1984 from dota17/document-fix Modify the document about operator== | 2020-04-11 18:55:18 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 9154e991b8 | Merge branch 'develop' into feature/issue1913 | 2020-04-11 11:33:46 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | ea0a7c7b4f | Merge pull request #2025 from ArtemSarmini/issue-1971-basic_json-push_back Fixes #1971 (memory leak in basic_json::push_back) | 2020-04-10 13:19:14 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | d01193a4e4 | 🎨 run "make amalgamate" | 2020-04-10 13:18:12 +02:00 |  | 
				
					
						| 
								
								
									 chenguoping | 34cf7b7a48 | just restart ci | 2020-04-07 10:00:21 +08:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 6a53a95c32 | ⬆️ Hedley 13 | 2020-04-06 11:56:33 +02:00 |  | 
				
					
						| 
								
								
									 Artöm Bakri Al-Sarmini | e4d8dc02e8 | Fixes #1971 (memory leak in basic_json::push_back) | 2020-04-02 15:20:25 +03:00 |  | 
				
					
						| 
								
								
									 chenguoping | e07686f0c7 | update array_index() and add testcases | 2020-03-25 15:57:20 +08:00 |  | 
				
					
						| 
								
								
									 chenguoping | 2e7d340dad | docs:modify the document about operator== | 2020-03-25 10:18:04 +08:00 |  | 
				
					
						| 
								
								
									 garethsb-sony | 7fe16f9400 | PR for #2006 to test in AppVeyor. | 2020-03-24 12:53:59 +00:00 |  | 
				
					
						| 
								
								
									 chenguoping | dcd3a6c62b | move the catch of std::invalid_argument into array_index() | 2020-03-23 17:24:47 +08:00 |  | 
				
					
						| 
								
								
									 chenguoping | 59cb4c93be | fix C26451 warnning in serializer.hpp for VS2019 | 2020-03-23 16:08:47 +08:00 |  | 
				
					
						| 
								
								
									 chenguoping | 0a8216890d | fix C26451 warnnings in to_chars.hpp | 2020-03-23 15:27:35 +08:00 |  | 
				
					
						| 
								
								
									 chenguoping | bfc003cadf | catch exceptions for json_point : /xx/+99 | 2020-03-17 20:49:28 +08:00 |  | 
				
					
						| 
								
								
									 Francois Chabot | 41b0704ce1 | removed move assignments from input adapters | 2020-03-02 23:50:01 -05:00 |  | 
				
					
						| 
								
								
									 Francois Chabot | c7282d5b1e | simpler endian detection for older gcc versions | 2020-02-20 10:19:29 -05:00 |  | 
				
					
						| 
								
								
									 Francois Chabot | 770ae6e9da | accomodate older gcc | 2020-02-19 16:54:09 -05:00 |  | 
				
					
						| 
								
								
									 Francois Chabot | de35fad88e | fixed missing return arg of operator=() | 2020-02-19 15:23:49 -05:00 |  | 
				
					
						| 
								
								
									 Francois Chabot | 2e2cf02cfd | duck-typed object input adapters | 2020-02-19 14:59:31 -05:00 |  | 
				
					
						| 
								
								
									 Francois Chabot | a0c4fc945a | fixed bad friend class declaration | 2020-02-19 11:23:02 -05:00 |  | 
				
					
						| 
								
								
									 Francois Chabot | 617b3cf42e | templated input adapters | 2020-02-19 10:32:49 -05:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 61b46a56fb | 🏗️ replace is_pod by is_trivial | 2020-02-15 10:12:27 +01:00 |  | 
				
					
						| 
								
								
									 Antoine Cœur | 8d92ca865f | Some typos | 2020-02-02 17:29:37 +08:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 7acf6218b6 | 📝 fix typo #1903 | 2020-01-15 17:40:03 +01:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 0feea6168d | 📝 fix scanner documentation | 2020-01-12 10:22:11 +01:00 |  | 
				
					
						| 
								
								
									 Michael Balszun | 5c045f7d0a | Use correct accumulator type in binary_writer if size_t != ul - Also fixes warning in msvc about possible loss of data in
  that size computation. | 2019-11-19 11:06:45 +01:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | c5eafe74e8 | 🔖 set version to 3.7.3 | 2019-11-17 12:09:12 +01:00 |  | 
				
					
						| 
								
								
									 Isaac Nickaein | efa13c663d | Reserve stack only for top-level items | 2019-11-13 15:23:08 +03:30 |  | 
				
					
						| 
								
								
									 Isaac Nickaein | 948f98cf4a | Cleanups Make our intent more clear in destruction | 2019-11-12 22:24:11 +03:30 |  | 
				
					
						| 
								
								
									 Isaac Nickaein | 0f3ec003bb | Remove harmful vector::reserve during destruction (#1837) | 2019-11-12 22:22:55 +03:30 |  | 
				
					
						| 
								
								
									 Niels Lohmann | be61ad1470 | 🎨 fix inconsistent operator style | 2019-11-11 21:37:32 +01:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 56109eacd7 | 🔖 set version to 3.7.2 | 2019-11-10 21:23:39 +01:00 |  | 
				
					
						| 
								
								
									 Isaac Nickaein | eec1974218 | Merge remote-tracking branch 'nlohmann/develop' into iterate-on-destruction | 2019-11-09 14:50:48 +03:30 |  | 
				
					
						| 
								
								
									 Niels Lohmann | aacdc6bbe3 | 🔖 set version to 3.7.1 | 2019-11-06 18:37:26 +01:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 62dada05ca | 🐛 fix conversion to std::valarray closes #1824 | 2019-11-05 19:28:00 +01:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 7bcaba0ca9 | Merge pull request #1821 from AnthonyVH/develop Fix for #1647 | 2019-11-05 19:15:54 +01:00 |  | 
				
					
						| 
								
								
									 Anthony VH | c4923e3d05 | Merge remote-tracking branch 'upstream/develop' into develop | 2019-11-04 20:50:43 +01:00 |  |