Commit Graph

  • 10fc5162e7 ⬆️ use Clang 12 where available Niels Lohmann 2021-04-24 13:24:36 +02:00
  • 9774e53cd6 Merge pull request #2707 from raduteo/patch-2 Niels Lohmann 2021-04-23 09:48:38 +02:00
  • 0a2de2f5b9 fixed amalgation file for #2728 David Pfahler 2021-04-21 12:54:55 +02:00
  • 6b267e3cb1 fixed amalgation file for #2730 David Pfahler 2021-04-21 12:53:58 +02:00
  • 38952643c5 generate amalgation to fix CI for #2730 David Pfahler 2021-04-21 12:46:37 +02:00
  • 31c4c8f36c Fixes #2730 David Pfahler 2021-04-21 11:03:28 +02:00
  • 1a1381f071 Fixes #2728 David Pfahler 2021-04-21 10:24:01 +02:00
  • 35d79203ec Update json.hpp raduteo 2021-04-12 19:47:02 -04:00
  • e8dbd7be86 Update json.hpp raduteo 2021-04-09 09:35:58 -04:00
  • 7126d88803 Merge pull request #2690 from doronbehar/patch-1 Niels Lohmann 2021-03-30 07:50:28 +02:00
  • 53a9850eeb pkg-config.pc.in: Don't concatenate paths Doron Behar 2021-03-29 21:43:49 +00:00
  • 3f33c21725 Merge pull request #2689 from nlohmann/ci_matrix Niels Lohmann 2021-03-29 09:25:04 +02:00
  • d927f44576 💚 fix build Niels Lohmann 2021-03-28 15:30:37 +02:00
  • 077fe41a82 🚧 do not check pushes to non-default branches Niels Lohmann 2021-03-28 14:59:42 +02:00
  • ae99a31bea 🚧 add more CI tests Niels Lohmann 2021-03-28 14:48:58 +02:00
  • f268035946 👷 consolidate CI Niels Lohmann 2021-03-28 13:37:04 +02:00
  • 1f1fa9f30e 🔥 remove some Travis builds Niels Lohmann 2021-03-27 14:44:39 +01:00
  • c591b6ca6c 👷 move some MSVC jobs from AppVeyor to GitHub Actions Niels Lohmann 2021-03-27 10:43:05 +01:00
  • 5213ae56ac Merge pull request #2687 from musicinmybrain/nonconstant-sigstksz Niels Lohmann 2021-03-27 07:06:04 +01:00
  • ef826b6fba Update doctest from 2.4.4 to 2.4.6 (fixes #2686) Benjamin A. Beasley 2021-03-25 13:16:04 -04:00
  • 823801879a Merge pull request #2683 from nlohmann/license_fix Niels Lohmann 2021-03-25 13:04:55 +01:00
  • 4a344e1ef0 Merge pull request #2375 from karzhenkov/fix-travis-release Niels Lohmann 2021-03-25 12:14:22 +01:00
  • 2b865131d8 Fixing CI errors. Anthony VH 2021-03-24 23:33:21 +01:00
  • 9d57351175 🐛 set correct value for JSON_ImplicitConversions in ci_test_noimplicitconversions Niels Lohmann 2021-03-24 20:27:12 +01:00
  • bf75a1b91d Merge branch 'develop' into #2375 Alexander Karzhenkov 2021-03-24 13:35:38 +05:00
  • 8e79917d32 Fix clang-tidy complaints. Anthony VH 2021-03-24 13:27:59 +01:00
  • 41dbd50313 📄 use code from Google Abseil Niels Lohmann 2021-03-24 13:27:00 +01:00
  • 322bc99d8e Reran amalgamate. Anthony VH 2021-03-24 13:03:36 +01:00
  • ca9a1f2fd4 📝 add note to outdated exceptions Niels Lohmann 2021-03-24 12:46:34 +01:00
  • 333612ce35 Merge remote-tracking branch 'upstream/develop' into non_default_constructable_stl_containers Anthony VH 2021-03-24 12:33:57 +01:00
  • 6f551930e5 🚨 add new CI and fix warnings (#2561) Niels Lohmann 2021-03-24 07:15:18 +01:00
  • 6b74772fe8 Merge pull request #2673 from remyjette/remove-exception-annotation Niels Lohmann 2021-03-23 07:48:00 +01:00
  • 80e7d6fd9f Merge pull request #2679 from frasermarlow/patch-1 Niels Lohmann 2021-03-23 07:44:32 +01:00
  • 098dd6bf34 Merge pull request #2659 from abbaswasim/patch-1 Niels Lohmann 2021-03-23 07:22:44 +01:00
  • 90d51b9205 Update parse_exceptions.md Fraser 2021-03-18 12:25:12 -04:00
  • 0a9ec38f44 Remove HEDLEY annotation from exception::what() Remy Jette 2021-03-15 17:30:58 -07:00
  • ddbdb65834 Fix amount of entries in the json object abbaswasim 2021-03-02 01:42:33 +00:00
  • 176d8e261a Merge pull request #2562 from nlohmann/diagnostics Niels Lohmann 2021-02-10 07:20:54 +01:00
  • bb90e34d22 ⬆️ Hedley v15 Niels Lohmann 2021-02-07 17:47:08 +01:00
  • 56a6dec0de 🔀 merge develop branch Niels Lohmann 2021-02-07 17:46:11 +01:00
  • 4917e7c259 Merge branch 'develop' of https://github.com/nlohmann/json into diagnostics Niels Lohmann 2021-02-07 17:45:09 +01:00
  • e754ef7087 Merge pull request #2625 from wawiesel/patch-1 Niels Lohmann 2021-02-07 14:26:38 +01:00
  • 567e2e3412 Fix missing 1.78 in example in README.md William A. Wieselquist 2021-02-06 14:48:12 -05:00
  • 6d4eed5aeb 🚨 fix warning Niels Lohmann 2021-01-30 12:51:54 +01:00
  • 27b44cb17b Merge branch 'issue2615' of https://github.com/nlohmann/json into develop Niels Lohmann 2021-01-28 14:47:28 +01:00
  • 9f6b78ee5a 📝 add documentation Niels Lohmann 2021-01-27 14:34:10 +01:00
  • 5b0c804630 🐛 properly assign two labels to one test case #2596 Niels Lohmann 2021-01-27 14:22:58 +01:00
  • ffdeb77468 🚨 fix warnings #2615 issue2615 Niels Lohmann 2021-01-27 12:54:46 +01:00
  • 3b63a47270 🚨 suppress warning Niels Lohmann 2021-01-26 20:53:02 +01:00
  • 524eea5887 👌 remove unused template parameter Niels Lohmann 2021-01-26 17:49:15 +01:00
  • 74cc0ab470 ♻️ remove diagnostics_t class Niels Lohmann 2021-01-25 13:47:50 +01:00
  • 130382f2a9 Remove comment about GCC commit which didn't really relate to the code. Anthony VH 2021-01-24 20:02:24 +01:00
  • e8dba10f53 add test Niels Lohmann 2021-01-24 17:45:48 +01:00
  • c190a72f3d 👌 apply suggestion Niels Lohmann 2021-01-24 17:45:08 +01:00
  • b83fe5dbf2 Merge pull request #2607 from nlohmann/issue1952 Niels Lohmann 2021-01-24 13:58:20 +01:00
  • 380a613f2b 🐛 fix bug in diagnostics_t Niels Lohmann 2021-01-23 20:58:59 +01:00
  • 848927ae90 Updated comments as requested. Anthony VH 2021-01-23 18:24:47 +01:00
  • 312a998873 🚸 add GDB pretty printer Niels Lohmann 2021-01-23 13:26:44 +01:00
  • 7b7da08fb6 📝 update documentation Niels Lohmann 2021-01-23 10:04:19 +01:00
  • 42218cac1b ⚗️ try 9 bytes Niels Lohmann 2021-01-21 22:01:09 +01:00
  • d00ad33e46 📝 update documentation Niels Lohmann 2021-01-21 21:47:19 +01:00
  • 51ac6000d2 improve coverage Niels Lohmann 2021-01-21 13:36:23 +01:00
  • d6ff059a90 👌 addressed review comments Niels Lohmann 2021-01-20 15:05:07 +01:00
  • 33379684b4 improve coverage Niels Lohmann 2021-01-17 22:52:40 +01:00
  • 5ec0980514 💚 fix build Niels Lohmann 2021-01-17 16:51:14 +01:00
  • 65107f7c9d 💚 fix build Niels Lohmann 2021-01-17 13:32:36 +01:00
  • e23af7434d 🚨 fix warnings Niels Lohmann 2021-01-17 13:32:26 +01:00
  • aeecc09ba1 add tests for diagnostics Niels Lohmann 2021-01-16 15:33:19 +01:00
  • e9d641130d 🐛 proper JSON Pointer escape in diagnostic messages Niels Lohmann 2021-01-16 15:33:05 +01:00
  • 29f7abf57d 🚨 fix format-truncation warning #2572 Niels Lohmann 2021-01-15 17:01:47 +01:00
  • 7633a21e6c 💚 fix build Niels Lohmann 2021-01-15 16:58:05 +01:00
  • b0d8628c49 👌 address comments Niels Lohmann 2021-01-15 16:54:00 +01:00
  • 1a467a8c4e Merge branch 'develop' of https://github.com/nlohmann/json into diagnostics Niels Lohmann 2021-01-15 16:48:50 +01:00
  • f8037660d0 ♻️ add iterator set_parent function Niels Lohmann 2021-01-14 22:43:52 +01:00
  • 92fa1d9582 Merge pull request #2582 from bl-ue/patch-1 Niels Lohmann 2021-01-14 22:11:33 +01:00
  • 0d1fb383b7 👌 address comment Niels Lohmann 2021-01-14 22:05:08 +01:00
  • c9d325b64b readme: fix tilde character display bl-ue 2021-01-14 15:59:28 -05:00
  • a77621687a 📝 fix comment Niels Lohmann 2021-01-14 21:56:19 +01:00
  • b9d3aa4067 ♻️ split set_parent function Niels Lohmann 2021-01-14 21:55:49 +01:00
  • 10751d1189 Merge branch 'develop' of https://github.com/nlohmann/json into diagnostics Niels Lohmann 2021-01-14 21:38:48 +01:00
  • 6eb37e9b78 Only add conditional constexpr to get() for >= C++14 to work around errors on older compilers. Anthony VH 2021-01-14 12:39:03 +01:00
  • d7c0f157c5 Merged from_json for pair and tuple to try to fix C2995 error in old MSVC versions. Anthony VH 2021-01-13 20:47:03 +01:00
  • fbf6df63d9 Enable member function calls in trailing return decltype expressions for older compilers. Anthony VH 2021-01-13 00:12:51 +01:00
  • fc8c584288 Regenerated single include. Anthony VH 2021-01-12 18:29:05 +01:00
  • 6ef1614fa9 Refactor json::get() to use priority_tag. Anthony VH 2021-01-12 18:28:47 +01:00
  • 6278f31d23 Simplify from_json overloads. Anthony VH 2021-01-12 18:28:29 +01:00
  • 6ebf274ca0 Add internal version of is_default_constructible to work around LWG 2367. Anthony VH 2021-01-12 18:28:00 +01:00
  • 672e8bfc1d Fixed std::pair trying to deserialize via array functions. Anthony VH 2021-01-11 18:16:15 +01:00
  • 14be8c69fe 💰 add sponsor Niels Lohmann 2021-01-11 08:00:49 +01:00
  • ff57bdcc8b 🐛 fix invariants Niels Lohmann 2021-01-10 22:40:50 +01:00
  • 23f462b598 Reduced code duplication, renamed tag to identity_tag. Anthony VH 2021-01-10 19:23:32 +01:00
  • 9d0150c234 ♻️ simplify code Niels Lohmann 2021-01-10 15:04:14 +01:00
  • 1d6ba22f15 ♻️ simplify code Niels Lohmann 2021-01-10 14:10:59 +01:00
  • a83404525e 🚨 fix warnings Niels Lohmann 2021-01-10 13:39:36 +01:00
  • e160749003 ♻️ move diagnostic code in header Niels Lohmann 2021-01-09 19:21:18 +01:00
  • 1b113f73c2 Added extra tests to improve coverage. Anthony VH 2021-01-09 17:54:56 +01:00
  • c0a8b45bbb Renamed template parameter and added some comments. Anthony VH 2021-01-09 17:45:56 +01:00
  • 1e825e4f92 Add support for deserialization of STL containers of non-default constructable types (fixes #2574). Anthony VH 2021-01-09 00:08:27 +01:00
  • 43cd5c8a4d 👌 fix constructor Niels Lohmann 2021-01-08 18:00:23 +01:00
  • d4a91b7445 👌 clean operator[] Niels Lohmann 2021-01-08 11:29:28 +01:00