Commit Graph

  • a33c3fdf25 Merge branch 'develop' of https://github.com/nlohmann/json into issue2286 Niels Lohmann 2020-07-23 12:30:07 +02:00
  • 88122467bd ♻️ pull code into function Niels Lohmann 2020-07-23 12:16:18 +02:00
  • a048b72fe1 Merge pull request #1559 from theodelrieu/feat/explicit_conversion_operator Niels Lohmann 2020-07-23 08:52:51 +02:00
  • 484029b51c Merge pull request #2299 from nlohmann/fix_warnings Niels Lohmann 2020-07-22 18:43:33 +02:00
  • a6d112ffbf add regression test for #2281 Niels Lohmann 2020-07-22 13:39:40 +02:00
  • 2301bd1177 add regression test for #2281 Niels Lohmann 2020-07-22 13:24:07 +02:00
  • c4356c68e0 add regression test for #2281 Niels Lohmann 2020-07-22 12:38:39 +02:00
  • 4d63252c6c add regression test for #2281 Niels Lohmann 2020-07-22 12:23:58 +02:00
  • a7c4c84d68 add regression test for #2281 Niels Lohmann 2020-07-22 12:03:37 +02:00
  • 797329315a add a CI job for explicit conversions on every os Théo DELRIEU 2020-07-16 11:22:57 +02:00
  • 74b446f5fd add a switch to enable implicit conversions (defaults to true) Théo DELRIEU 2020-07-16 11:11:35 +02:00
  • 2cd10a7405 Merge pull request #2300 from nlohmann/gihub_actions Niels Lohmann 2020-07-22 09:45:55 +02:00
  • 6bd38a2cb9 👷 merge Gitlab actions Niels Lohmann 2020-07-22 09:02:55 +02:00
  • 8b14c9b305 🚨 fix warnings Niels Lohmann 2020-07-21 23:00:56 +02:00
  • 3bb43ecd51 🔀 merge develop branch Niels Lohmann 2020-07-21 22:02:14 +02:00
  • 3249a4d821 Merge branch 'develop' of https://github.com/nlohmann/json into issue2286 Niels Lohmann 2020-07-21 22:01:32 +02:00
  • 96e9f66025 🔇 remove debug output Niels Lohmann 2020-07-21 22:01:15 +02:00
  • 8046754c15 🔊 add debug output to tests Niels Lohmann 2020-07-21 12:44:38 +02:00
  • b1903fff1f 💚 fix build Niels Lohmann 2020-07-21 09:09:30 +02:00
  • 1339d6b683 🐛 add missing EOF check Niels Lohmann 2020-07-20 22:40:28 +02:00
  • a9117828e1 🚨 fix warnings Niels Lohmann 2020-07-20 22:38:00 +02:00
  • 8344857764 Merge pull request #2287 from pfeatherstone/develop Niels Lohmann 2020-07-20 21:35:55 +02:00
  • 4a5277d09d 📝 update documentation Niels Lohmann 2020-07-20 14:11:43 +02:00
  • 8aa6da61dc 🚧 support for UBJSON high-precision numbers #2286 Niels Lohmann 2020-07-20 13:57:19 +02:00
  • 7360e09830 🚧 support for UBJSON high-precision numbers #2286 Niels Lohmann 2020-07-20 13:12:20 +02:00
  • 35b899e988 [JSON] initialise all member variables. Maybe this will shut valgrind up. std::tie probably wasn't the problem initially pf 2020-07-20 10:51:43 +01:00
  • 7cf2fe149c 🚧 support for UBJSON high-precision numbers #2286 Niels Lohmann 2020-07-20 09:42:37 +02:00
  • 7660ea12f6 [JSON] drop use of std::tie and std::tupe for operator== overload. valgrind and clang < 4 complain pf 2020-07-20 08:31:56 +01:00
  • 893eda8353 Merge pull request #2294 from jprochazk/develop Niels Lohmann 2020-07-20 08:02:03 +02:00
  • 678d310b85 [JSON] don't know why CHECK doesn't like "CHECK(obj1 == obj2)". So using a temporary bool. pf 2020-07-19 21:29:39 +01:00
  • e83ddb185d [JSON] use CHECK from doctest pf 2020-07-19 21:25:27 +01:00
  • 254f0e3cee [JSON] CHECK in doctest only accepts std::string ? Use assert statement instead. Does the job pf 2020-07-19 18:22:16 +01:00
  • 578217eaa3 [JSON] doctest: need another section ? pf 2020-07-19 18:17:03 +01:00
  • 6d9b2040ab [JSON] as per Nlohmann's suggestion, added unit tests for the (de)serialisation macros pf 2020-07-19 18:12:13 +01:00
  • 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 pf 2020-07-19 18:11:37 +01:00
  • 8f14aaa13f [JSON] as per Nlohmann's suggestion, moved the macro builder code to third_party directory pf 2020-07-19 18:10:08 +01:00
  • 851315c878 add regression test jprochazk 2020-07-19 18:35:58 +02:00
  • f7374c9a8d Merge branch 'develop' of https://github.com/pfeatherstone/json into develop pf 2020-07-19 17:32:35 +01:00
  • 0a158ee830 [JSON] rough and ready code for generating (de)serialisation macros. Current upper bound on number of member variables is set to 64 pf 2020-07-19 17:32:16 +01:00
  • 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 pf 2020-07-18 16:13:56 +01:00
  • 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 pf 2020-07-18 16:12:49 +01:00
  • 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 pf 2020-07-18 16:12:27 +01:00
  • 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 pf 2020-07-18 16:11:34 +01:00
  • 5eb739a585 [JSON] - dirty code for building intrusive and non-intrusive serialisation/deserialisation macros for custom types - netbeans project configurations pf 2020-07-18 16:10:32 +01:00
  • 68122fe0ed [JSON] dirty code for building intrusive and non-intrusive serialisation/deserialisation macros for custom types pf 2020-07-18 16:08:29 +01:00
  • b1da58b76b Merge pull request #2282 from nlohmann/missing_sax_check Niels Lohmann 2020-07-19 18:09:08 +02:00
  • 1fd6c5882a Merge pull request #2285 from T0b1-iOS/develop Niels Lohmann 2020-07-19 17:55:51 +02:00
  • d371a5283c run amalgamate jprochazk 2020-07-19 10:57:17 +02:00
  • ab25de05f7 fix: return -> result.push_back jprochazk 2020-07-19 10:51:13 +02:00
  • a3a9d5665e add break to binary_reader::get_binary and get_string jprochazk 2020-07-19 09:35:49 +02:00
  • 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 pf 2020-07-18 16:13:56 +01:00
  • 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 pf 2020-07-18 16:12:49 +01:00
  • 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 pf 2020-07-18 16:12:27 +01:00
  • 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 pf 2020-07-18 16:11:34 +01:00
  • 8730af0788 [JSON] - dirty code for building intrusive and non-intrusive serialisation/deserialisation macros for custom types - netbeans project configurations pf 2020-07-18 16:10:32 +01:00
  • beb1fb48f0 [JSON] dirty code for building intrusive and non-intrusive serialisation/deserialisation macros for custom types pf 2020-07-18 16:08:29 +01:00
  • 88243b3f8c run amalgamate T0b1-iOS 2020-07-18 07:09:56 +02:00
  • 281349d0d6 add inline specifier for detail::combine T0b1-iOS 2020-07-18 06:28:11 +02:00
  • 43ab8a2357 Merge pull request #2279 from nlohmann/issue1818 Niels Lohmann 2020-07-18 06:12:57 +02:00
  • 7fc4b2901a 🚸 add static assertion for missing binary function in SAX interface Niels Lohmann 2020-07-17 20:41:11 +02:00
  • 2fd57d3ed1 add test for target_include_directories #1818 Niels Lohmann 2020-07-17 14:26:22 +02:00
  • a10d486e36 Merge pull request #2244 from matthewbauer/tag-cbor Niels Lohmann 2020-07-17 14:05:48 +02:00
  • e65cc9dccb Merge pull request #2274 from nlohmann/analyzers Niels Lohmann 2020-07-17 14:01:19 +02:00
  • 548e7e54c9 Merge pull request #2273 from nlohmann/issue1968 Niels Lohmann 2020-07-17 13:59:55 +02:00
  • 6023a7ccd9 Merge branch 'develop' into analyzers Niels Lohmann 2020-07-17 13:59:32 +02:00
  • 270f1ae482 Merge pull request #2269 from nlohmann/hash Niels Lohmann 2020-07-17 13:57:47 +02:00
  • d047b3d495 🚨 remove linter warning Niels Lohmann 2020-07-16 14:45:39 +02:00
  • 26196f25f6 🔥 remove test Makefile targets (all handled by CMake) Niels Lohmann 2020-07-16 13:38:25 +02:00
  • 3d60befde3 🔧 adjust analysis targets Niels Lohmann 2020-07-16 12:14:06 +02:00
  • 7f6ea47bdb 🔧 adjust analysis targets Niels Lohmann 2020-07-16 09:44:07 +02:00
  • 4c59d6aaef 🔥 remove leftover Niels Lohmann 2020-07-16 09:43:35 +02:00
  • 23c97f4aa5 Merge pull request #2268 from t-b/feature/add-clang-cl Niels Lohmann 2020-07-16 07:40:58 +02:00
  • 93cdf05928 add tests Niels Lohmann 2020-07-15 14:23:22 +02:00
  • 01e196f6b6 Merge branch 'develop' of https://github.com/nlohmann/json into issue1968 Niels Lohmann 2020-07-15 13:50:00 +02:00
  • b821ed074f 💡 add documentation Niels Lohmann 2020-07-15 13:45:16 +02:00
  • 496ddd127c 💚 make test deterministic Niels Lohmann 2020-07-15 12:14:30 +02:00
  • 9449dfcc6a 💚 add test cases for hash Niels Lohmann 2020-07-15 09:27:01 +02:00
  • 25a59b59f2 Github Actions: Add ClangCL on Windows Thomas Braun 2020-07-14 14:15:24 +02:00
  • 6d7f8b3793 README.md: Remove trailing whitespace Thomas Braun 2020-07-14 15:36:06 +02:00
  • 33b0bed7fe 💚 fix compilation Niels Lohmann 2020-07-14 14:34:55 +02:00
  • 5b229f4cce hash function without allocation Niels Lohmann 2020-07-14 14:31:19 +02:00
  • 1a521cbd36 Merge pull request #2264 from t-b/feature/use-proper-SED-in-makefile Niels Lohmann 2020-07-14 14:07:33 +02:00
  • 8921e5e5db Merge pull request #2262 from nlohmann/more_ci Niels Lohmann 2020-07-13 21:04:57 +02:00
  • 88adffdaba Makefile: Always use SED variable Thomas Braun 2020-07-13 14:44:40 +02:00
  • c13ecd5344 💚 add trait for 128 bit integers issue2228 Niels Lohmann 2020-07-13 14:03:04 +02:00
  • 0f1f5052bf 💚 add trait for 128 bit integers Niels Lohmann 2020-07-13 13:46:56 +02:00
  • e3aace6dac 🔊 add test for type traits Niels Lohmann 2020-07-13 13:23:36 +02:00
  • 039c97694d 🔥 remove failing test Niels Lohmann 2020-07-13 12:51:39 +02:00
  • 23496a3abf 🔊 add test for type traits Niels Lohmann 2020-07-13 12:44:34 +02:00
  • 938b867450 📝 add Xcode 12 to CI list Niels Lohmann 2020-07-12 21:45:00 +02:00
  • bffa18b46e ♻️ replace alternative operator Niels Lohmann 2020-07-12 17:44:39 +02:00
  • de4933e093 🎨 fix format Niels Lohmann 2020-07-12 17:39:36 +02:00
  • aba37d001e Merge branch 'develop' of https://github.com/nlohmann/json into issue2228 Niels Lohmann 2020-07-12 17:39:13 +02:00
  • 3952739189 add CBOR tag handler #1968 Niels Lohmann 2020-07-12 16:51:43 +02:00
  • a244531627 ♻️ overwork Travis YAML Niels Lohmann 2020-07-12 15:33:16 +02:00
  • cf741313b3 📝 add Clang on Windows to CI list Niels Lohmann 2020-07-12 15:31:17 +02:00
  • e316f5c5b6 Merge pull request #2258 from nlohmann/issue2179 Niels Lohmann 2020-07-12 13:11:23 +02:00
  • 486812904f Merge pull request #2259 from nlohmann/clang_windows Niels Lohmann 2020-07-12 13:09:35 +02:00
  • 4d28694756 ♻️ replace further alternative operators Niels Lohmann 2020-07-11 19:28:58 +02:00
  • 738c83d6af 💚 add test for ordered_map Niels Lohmann 2020-07-11 19:24:32 +02:00