Commit Graph

  • 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
  • e4af1ddb18 👌 fix operator[] Niels Lohmann 2021-01-08 11:21:41 +01:00
  • 04a0a07159 👌 fix move constructor and move assignment Niels Lohmann 2021-01-08 11:21:03 +01:00
  • 0617bd248d 👌 fix operator[] Niels Lohmann 2021-01-08 11:10:24 +01:00
  • ddc3bb1992 👌 remove unnecessary assignment from destructor Niels Lohmann 2021-01-08 11:09:58 +01:00
  • 7cdf34b21e Merge branch 'develop' of https://github.com/nlohmann/json into diagnostics Niels Lohmann 2021-01-08 10:20:34 +01:00
  • 01f6b2e741 📄 update copyright year Niels Lohmann 2021-01-03 20:54:17 +01:00
  • 085d497bf7 📄 update copyright year Niels Lohmann 2021-01-03 20:28:06 +01:00
  • 7ffd3ae400 Merge branch 'develop' of https://github.com/nlohmann/json into feature/optional feature/optional Niels Lohmann 2021-01-03 20:15:28 +01:00
  • 384442e8e5 🔥 remove useless line Niels Lohmann 2021-01-03 20:15:03 +01:00
  • f1913fe7a9 ♻️ do not include experimental headers Niels Lohmann 2021-01-03 20:10:43 +01:00
  • 294fa343d5 🐛 fix bug in move constructor Niels Lohmann 2021-01-03 20:06:32 +01:00
  • ec0b1798bc 🚧 implement more parent relations Niels Lohmann 2021-01-02 21:36:11 +01:00
  • 7323a8eb4e 🚧 add tests Niels Lohmann 2021-01-02 16:13:04 +01:00
  • 09cd4ed125 🚧 fix preprocessor check Niels Lohmann 2021-01-02 14:10:40 +01:00
  • c6e7fa21ed 🚧 fix preprocessor check Niels Lohmann 2021-01-02 13:58:05 +01:00
  • ecaab32ef0 🚧 add switch for diagnostics Niels Lohmann 2021-01-02 13:45:00 +01:00
  • 7b047861b0 🚧 add diagnostics to exceptions Niels Lohmann 2021-01-02 13:44:41 +01:00
  • a4d491e22d 🚧 better diagnostics Niels Lohmann 2021-01-01 17:23:10 +01:00
  • 68c3696382 Merge pull request #2560 from nlohmann/issue2324 Niels Lohmann 2020-12-31 14:35:45 +01:00
  • 1587acdb1d 📝 adjust wording Niels Lohmann 2020-12-31 14:34:37 +01:00
  • be32cd0196 Merge branch 'develop' of https://github.com/nlohmann/json into issue2324 Niels Lohmann 2020-12-31 14:33:09 +01:00
  • 00e3f69a26 ⬆️ update Doxyfile for doxygen 1.9.0 Niels Lohmann 2020-12-30 20:31:16 +01:00
  • 581f92b601 Merge branch 'develop' of https://github.com/nlohmann/json into issue2324 Niels Lohmann 2020-12-30 20:23:07 +01:00
  • ebb63bd1fa Merge branch 'develop' of https://github.com/nlohmann/json into feature/optional Niels Lohmann 2020-12-30 18:41:51 +01:00
  • a8398a7151 Merge pull request #2550 from nlohmann/std_bytes Niels Lohmann 2020-12-30 08:33:52 +01:00
  • fc7e181cbf ⚗️ fix string representation Niels Lohmann 2020-12-29 22:21:31 +01:00
  • bdb2469c31 🚨 fix warnings Niels Lohmann 2020-12-29 21:36:30 +01:00
  • c886646707 🚨 fix warning Niels Lohmann 2020-12-29 21:04:41 +01:00
  • 4402176df5 add regression test Niels Lohmann 2020-12-29 20:52:57 +01:00
  • e4fc598466 ⚗️ add C++20 build Niels Lohmann 2020-12-29 20:45:56 +01:00
  • 77be4f6aaf ⚗️ add C++20 build Niels Lohmann 2020-12-29 20:32:07 +01:00
  • 91d7aa571f ⚗️ add C++20 build Niels Lohmann 2020-12-29 20:30:50 +01:00
  • ca51dc62f2 ⚗️ try to use Clang 10 Niels Lohmann 2020-12-29 20:21:43 +01:00