| 
								
								
									 Niels Lohmann | 8344857764 | Merge pull request #2287 from pfeatherstone/develop Serialisation macros: increase upper bound on number of member variables | 2020-07-20 21:35:55 +02:00 |  | 
				
					
						| 
								
								
									 pf | 35b899e988 | [JSON] initialise all member variables. Maybe this will shut valgrind up. std::tie probably wasn't the problem initially | 2020-07-20 10:51:43 +01:00 |  | 
				
					
						| 
								
								
									 pf | 7660ea12f6 | [JSON] drop use of std::tie and std::tupe for operator== overload. valgrind and clang < 4 complain | 2020-07-20 08:31:56 +01:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 893eda8353 | Merge pull request #2294 from jprochazk/develop fix eof for get_binary and get_string | 2020-07-20 08:02:03 +02:00 |  | 
				
					
						| 
								
								
									 pf | 678d310b85 | [JSON] don't know why CHECK doesn't like "CHECK(obj1 == obj2)". So using a temporary bool. | 2020-07-19 21:29:39 +01:00 |  | 
				
					
						| 
								
								
									 pf | e83ddb185d | [JSON] use CHECK from doctest | 2020-07-19 21:25:27 +01:00 |  | 
				
					
						| 
								
								
									 pf | 254f0e3cee | [JSON] CHECK in doctest only accepts std::string ? Use assert statement instead. Does the job | 2020-07-19 18:22:16 +01:00 |  | 
				
					
						| 
								
								
									 pf | 578217eaa3 | [JSON] doctest: need another section ? | 2020-07-19 18:17:03 +01:00 |  | 
				
					
						| 
								
								
									 pf | 6d9b2040ab | [JSON] as per Nlohmann's suggestion, added unit tests for the (de)serialisation macros | 2020-07-19 18:12:13 +01:00 |  | 
				
					
						| 
								
								
									 pf | 75a6888d55 | [JSON] since we no longer use a netbeans project for the (de)serialisation macro building code, can revert the changes made to the .gitignore file | 2020-07-19 18:11:37 +01:00 |  | 
				
					
						| 
								
								
									 pf | 8f14aaa13f | [JSON] as per Nlohmann's suggestion, moved the macro builder code to third_party directory | 2020-07-19 18:10:08 +01:00 |  | 
				
					
						| 
								
								
									 jprochazk | 851315c878 | add regression test | 2020-07-19 18:35:58 +02:00 |  | 
				
					
						| 
								
								
									 pf | f7374c9a8d | Merge branch 'develop' of https://github.com/pfeatherstone/json into develop | 2020-07-19 17:32:35 +01:00 |  | 
				
					
						| 
								
								
									 pf | 0a158ee830 | [JSON] rough and ready code for generating (de)serialisation macros. Current upper bound on number of member variables is set to 64 | 2020-07-19 17:32:16 +01:00 |  | 
				
					
						| 
								
								
									 pf | 21bd6e971b | [JSON] 	- dirty code for building intrusive and non-intrusive serialisation/deserialisation macros for custom types - updated .gitignore file to ignore private netbeans project configurations | 2020-07-19 17:26:56 +01:00 |  | 
				
					
						| 
								
								
									 pf | 0b744e1ed0 | [JSON] 	- dirty code for building intrusive and non-intrusive serialisation/deserialisation macros for custom types - used code to increase the upper bound on number of member variables to 64 | 2020-07-19 17:26:56 +01:00 |  | 
				
					
						| 
								
								
									 pf | 8a045713ed | [JSON] 	- dirty code for building intrusive and non-intrusive serialisation/deserialisation macros for custom types - used code to increase the upper bound on number of member variables to 64 | 2020-07-19 17:26:56 +01:00 |  | 
				
					
						| 
								
								
									 pf | a575008c48 | [JSON] 	- dirty code for building intrusive and non-intrusive serialisation/deserialisation macros for custom types - updated .gitignore file to ignore "dist" and "build" directories in netbeans project | 2020-07-19 17:26:56 +01:00 |  | 
				
					
						| 
								
								
									 pf | 5eb739a585 | [JSON] 	- dirty code for building intrusive and non-intrusive serialisation/deserialisation macros for custom types - netbeans project configurations | 2020-07-19 17:26:56 +01:00 |  | 
				
					
						| 
								
								
									 pf | 68122fe0ed | [JSON] dirty code for building intrusive and non-intrusive serialisation/deserialisation macros for custom types | 2020-07-19 17:26:56 +01:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | b1da58b76b | Merge pull request #2282 from nlohmann/missing_sax_check Add static assertion for missing binary function in SAX interface | 2020-07-19 18:09:08 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 1fd6c5882a | Merge pull request #2285 from T0b1-iOS/develop add inline specifier for detail::combine | 2020-07-19 17:55:51 +02:00 |  | 
				
					
						| 
								
								
									 jprochazk | d371a5283c | run amalgamate | 2020-07-19 10:57:17 +02:00 |  | 
				
					
						| 
								
								
									 jprochazk | ab25de05f7 | fix: return -> result.push_back | 2020-07-19 10:51:13 +02:00 |  | 
				
					
						| 
								
								
									 jprochazk | a3a9d5665e | add break to binary_reader::get_binary and get_string | 2020-07-19 09:35:49 +02:00 |  | 
				
					
						| 
								
								
									 pf | 0d2d088b97 | [JSON] 	- dirty code for building intrusive and non-intrusive serialisation/deserialisation macros for custom types - updated .gitignore file to ignore private netbeans project configurations | 2020-07-18 16:13:56 +01:00 |  | 
				
					
						| 
								
								
									 pf | c122d8a94f | [JSON] 	- dirty code for building intrusive and non-intrusive serialisation/deserialisation macros for custom types - used code to increase the upper bound on number of member variables to 64 | 2020-07-18 16:12:49 +01:00 |  | 
				
					
						| 
								
								
									 pf | 4706d6e976 | [JSON] 	- dirty code for building intrusive and non-intrusive serialisation/deserialisation macros for custom types - used code to increase the upper bound on number of member variables to 64 | 2020-07-18 16:12:27 +01:00 |  | 
				
					
						| 
								
								
									 pf | 9afe757648 | [JSON] 	- dirty code for building intrusive and non-intrusive serialisation/deserialisation macros for custom types - updated .gitignore file to ignore "dist" and "build" directories in netbeans project | 2020-07-18 16:11:34 +01:00 |  | 
				
					
						| 
								
								
									 pf | 8730af0788 | [JSON] 	- dirty code for building intrusive and non-intrusive serialisation/deserialisation macros for custom types - netbeans project configurations | 2020-07-18 16:10:32 +01:00 |  | 
				
					
						| 
								
								
									 pf | beb1fb48f0 | [JSON] dirty code for building intrusive and non-intrusive serialisation/deserialisation macros for custom types | 2020-07-18 16:08:29 +01:00 |  | 
				
					
						| 
								
								
									 T0b1-iOS | 88243b3f8c | run amalgamate | 2020-07-18 07:09:56 +02:00 |  | 
				
					
						| 
								
								
									 T0b1-iOS | 281349d0d6 | add inline specifier for detail::combine | 2020-07-18 06:28:11 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 43ab8a2357 | Merge pull request #2279 from nlohmann/issue1818 Add test for target_include_directories | 2020-07-18 06:12:57 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 7fc4b2901a | 🚸 add static assertion for missing binary function in SAX interface | 2020-07-17 20:41:11 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 2fd57d3ed1 | ✅ add test for target_include_directories #1818 | 2020-07-17 14:26:22 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | a10d486e36 | Merge pull request #2244 from matthewbauer/tag-cbor Tag binary values in cbor if set | 2020-07-17 14:05:48 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | e65cc9dccb | Merge pull request #2274 from nlohmann/analyzers Clean up maintainer Makefiles and fix some linter warnings | 2020-07-17 14:01:19 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 548e7e54c9 | Merge pull request #2273 from nlohmann/issue1968 Add option to ignore CBOR tags | 2020-07-17 13:59:55 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 6023a7ccd9 | Merge branch 'develop' into analyzers | 2020-07-17 13:59:32 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 270f1ae482 | Merge pull request #2269 from nlohmann/hash Hash function without allocation | 2020-07-17 13:57:47 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | d047b3d495 | 🚨 remove linter warning | 2020-07-16 14:45:39 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 26196f25f6 | 🔥 remove test Makefile targets (all handled by CMake) | 2020-07-16 13:38:25 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 3d60befde3 | 🔧 adjust analysis targets | 2020-07-16 12:14:06 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 7f6ea47bdb | 🔧 adjust analysis targets | 2020-07-16 09:44:07 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 4c59d6aaef | 🔥 remove leftover | 2020-07-16 09:43:35 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 23c97f4aa5 | Merge pull request #2268 from t-b/feature/add-clang-cl Add ClangCL for MSVC | 2020-07-16 07:40:58 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 93cdf05928 | ✅ add tests | 2020-07-15 14:23:22 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 01e196f6b6 | Merge branch 'develop' of https://github.com/nlohmann/json into issue1968 | 2020-07-15 13:50:00 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | b821ed074f | 💡 add documentation | 2020-07-15 13:45:16 +02:00 |  |