Commit Graph

  • aea5b87e31
    Merge 14e3318929 into fd20975a94 Alexander Karzhenkov 2024-11-16 17:17:44 +0100
  • fd20975a94
    Add CPack support (#4459) zjyhjqs 2024-11-17 00:09:05 +0800
  • 2b85d07965 Merge branch 'develop' into fix-#4485 Jordan 2024-11-15 20:03:24 -0800
  • fde9a86c5a
    Make iterator_proxy_value a forward_iterator (#4371) (#4372) Captain Crutches 2024-11-15 00:28:40 -0800
  • d3c98ae97b Merge branch 'develop' into fix-#4485 Jordan 2024-11-14 16:19:21 -0800
  • 44f7c9a7a2 Suppress tidy warning Captain Crutches 2024-11-14 12:03:48 -0500
  • 296549c3ad Suppress lint instead of changing to 'contains' Fredrik Sandhei 2024-11-14 15:51:27 +0100
  • 3a9ff36935 Make clang-tidy happy Fredrik Sandhei 2024-11-14 15:37:41 +0100
  • 4341bef2d6 Move include of optional out of macro_scope; probably does not make sense to be there Fredrik Sandhei 2024-11-14 08:37:10 +0100
  • a83e52388e amalgamate Fredrik Sandhei 2024-11-14 08:23:19 +0100
  • faa61f1b36 Remove Wfloat-equal suppress Fredrik Sandhei 2024-11-13 21:53:46 +0100
  • 2edff8eba2 missing endif Fredrik Sandhei 2024-11-13 20:56:12 +0100
  • a37eeab2eb Only define conversion to std::optional when JSON_USE_IMPLICIT_CONVERSION is disabled. Fredrik Sandhei 2024-03-21 22:00:28 +0100
  • 068e3fbd13 Fix failing test Fredrik Sandhei 2024-03-19 22:16:04 +0100
  • e6e9ff9887 Add missing #endif after rebase Fredrik Sandhei 2023-05-20 12:02:44 +0200
  • b432a6123a ♻️ do not include experimental headers Niels Lohmann 2021-01-03 20:10:43 +0100
  • 7ffe2c4bbd 🏁 include right <optional> header Niels Lohmann 2020-05-17 13:58:09 +0200
  • 1e9eea58e2 update tests Niels Lohmann 2020-05-16 19:37:18 +0200
  • f4990ae0cf Use JSON_HAS_CPP_17 only after it has been defined Markus Palonen 2019-12-17 16:25:35 +0200
  • 7776939754 💚 overwork tests Niels Lohmann 2019-11-23 14:40:15 +0100
  • a02f9b90f9 🏁 fix <optional> inclusion Niels Lohmann 2019-11-23 13:29:47 +0100
  • a112a3a600 🚧 conversions for std::optional Niels Lohmann 2019-11-23 00:21:33 +0100
  • 3f459686a0 Amalgamate Captain Crutches 2024-05-10 15:58:07 -0400
  • fd63fa8294 Make iteration_proxy_value model forward_iterator Captain Crutches 2024-05-10 15:24:06 -0400
  • 3c50c13f64
    Merge d2f1d904d9 into 1825117e63 ArnaudBienner 2024-11-13 11:24:12 +0200
  • 1825117e63
    Another desperate try to fix the CI (#4489) Niels Lohmann 2024-11-13 10:21:26 +0100
  • 13efcf2c90
    Merge 4fbc3779f9 into 4a602df34e Laramie Leavitt 2024-11-10 09:39:59 -0700
  • f1a58ee5f5
    Merge 9561a122a3 into 4a602df34e Niels Lohmann 2024-11-10 13:17:54 +0100
  • 4a602df34e
    Add lgtm explanation (#4362) Niels Lohmann 2024-11-10 13:15:23 +0100
  • 1981cd3186
    🚨 fix warning Niels Lohmann 2024-11-10 13:03:16 +0100
  • 1ce3c3284f
    🚨 fix warning Niels Lohmann 2024-11-10 12:14:42 +0100
  • 4658117af4
    💚 update actions Niels Lohmann 2024-11-10 09:51:32 +0100
  • 3c58f91039
    Merge branch 'nlohmann:develop' into fix-#4485 jh96 2024-11-09 15:35:43 -0800
  • da245b0ab8
    💚 update actions Niels Lohmann 2024-11-09 22:33:23 +0100
  • 103d5483e4
    💚 update actions Niels Lohmann 2024-11-09 22:01:30 +0100
  • f99b05afe0 Ninja doesn't like not having a \n, at end of file, adding it back Jordan 2024-11-09 12:57:32 -0800
  • ce3a4ff3f1
    💚 update actions Niels Lohmann 2024-11-09 21:39:02 +0100
  • f1b375de07
    💚 update actions Niels Lohmann 2024-11-09 21:20:22 +0100
  • e97245bc8e
    🚨 fix warning Niels Lohmann 2024-11-09 20:46:29 +0100
  • 463315f319
    💚 update actions Niels Lohmann 2024-11-09 20:29:58 +0100
  • 00ff4867cf
    💚 update actions Niels Lohmann 2024-11-09 20:00:20 +0100
  • b3dba9f2ad
    🚨 fix warning Niels Lohmann 2024-11-09 19:40:14 +0100
  • e9ced385ad
    🚨 fix warning Niels Lohmann 2024-11-09 19:23:03 +0100
  • 3d6bb515a5
    🚨 fix warning Niels Lohmann 2024-11-09 19:22:50 +0100
  • 10ec1b51d4
    🚨 fix warning Niels Lohmann 2024-11-09 19:09:30 +0100
  • 3086fe34fc
    💚 update actions Niels Lohmann 2024-11-09 19:09:21 +0100
  • 6370e0ff41
    💚 update actions Niels Lohmann 2024-11-09 17:50:15 +0100
  • 7ede04353a
    💚 update actions Niels Lohmann 2024-11-09 17:48:22 +0100
  • 20fec65c11
    🚨 fix warning Niels Lohmann 2024-11-09 17:43:36 +0100
  • 68c66ab699
    💚 update actions Niels Lohmann 2024-11-09 17:31:15 +0100
  • 42b256988b
    🚨 fix warning Niels Lohmann 2024-11-09 17:30:25 +0100
  • d724e8cc0c
    🚨 fix warning Niels Lohmann 2024-11-09 12:47:02 +0100
  • 82d534c37e
    💚 update actions Niels Lohmann 2024-11-09 12:46:54 +0100
  • dac7fa260a
    💚 update actions Niels Lohmann 2024-11-09 12:22:09 +0100
  • ee21e07690
    🚨 fix warning Niels Lohmann 2024-11-09 12:13:46 +0100
  • 01f4a1479c
    🚨 fix warning Niels Lohmann 2024-11-09 11:37:28 +0100
  • b0fc72c52c
    🚨 fix warning Niels Lohmann 2024-11-09 11:26:43 +0100
  • d089e07910
    💚 update actions Niels Lohmann 2024-11-09 11:18:59 +0100
  • 09daad1862
    🚨 fix warning Niels Lohmann 2024-11-09 11:15:05 +0100
  • 530e063b96 add back include <memory> for testing something Jordan 2024-11-08 20:45:38 -0800
  • ae4d67d6e7 moved tests around, changed exceptions, removed a possibly unneeded include Jordan 2024-11-08 20:20:58 -0800
  • 9561a122a3
    🚨 fix warning Niels Lohmann 2024-11-08 23:47:11 +0100
  • ad552c41be
    🚨 fix warning Niels Lohmann 2024-11-08 23:41:46 +0100
  • 078d25ed68
    🚨 fix warning Niels Lohmann 2024-11-08 23:19:04 +0100
  • ddecb704e3
    🚨 fix warning Niels Lohmann 2024-11-08 23:13:25 +0100
  • 9240ba4911
    Merge remote-tracking branch 'origin/clang-tidy' into clang-tidy Niels Lohmann 2024-11-08 23:07:51 +0100
  • b48e05be7c
    💚 update actions Niels Lohmann 2024-11-08 23:07:44 +0100
  • c4ec5e0bc5
    Merge branch 'develop' into clang-tidy Niels Lohmann 2024-11-08 22:49:30 +0100
  • 83dc915ac2
    🚑 fix warning Niels Lohmann 2024-11-08 22:48:11 +0100
  • 88318f9a77
    🔀 merge develop Niels Lohmann 2024-11-08 22:40:55 +0100
  • 18ff442e63
    Allow overriding the CMake target name (#4483) Borislav Stanimirov 2024-11-08 22:42:36 +0200
  • aff5a31d35
    Add NLOHMANN_DEFINE_DERIVED_TYPE_* macros (#4033) Niccolò Iardella 2024-11-08 21:41:19 +0100
  • 5345c07083
    Correct serialisation table slowriot 2024-11-07 13:59:52 +0000
  • 8fa46288b7
    Update bson mapping tables slowriot 2024-11-07 13:50:16 +0000
  • d14286388f
    Remove BSON integer limit slowriot 2024-11-07 13:43:16 +0000
  • 8386c26b34 Fix compile issues Jordan 2024-11-05 22:40:07 -0800
  • 62bc8f8e94 quick cleanup Jordan 2024-11-05 22:13:06 -0800
  • 17bd783405 Possible fix for #4485 Jordan 2024-11-05 21:52:56 -0800
  • 814f72973b
    Merge 2890205f43 into ac8b22180d Joyce 2024-11-04 22:03:39 +0200
  • 29274da99d
    Merge acf1b9760e into ac8b22180d Yurun 2024-11-04 22:03:39 +0200
  • ac8b22180d
    Update CONTRIBUTING.md (#4486) Balazs Erseki 2024-11-04 17:45:58 +0100
  • 91fbd63af2
    Update CONTRIBUTING.md Balazs Erseki 2024-11-04 15:43:45 +0100
  • 0da0d2e739
    Allow overriding the CMake target name Borislav Stanimirov 2024-11-04 13:23:21 +0200
  • 4fbc3779f9 Run make amalgamate Laramie Leavitt 2024-10-16 09:53:16 -0700
  • 40e806bae6 Revise: Include only one of abi_macros or macro_scope. Laramie Leavitt 2024-10-16 09:46:30 -0700
  • 34f73c0073 Run make amalgamate Laramie Leavitt 2024-10-15 17:24:58 -0700
  • aa38409b7c Add missing #includes based on C++ language server. Laramie Leavitt 2024-10-15 17:07:00 -0700
  • 845e1f3e14 removing tests folder Adriano Rezende 2024-10-13 00:22:25 -0400
  • 6325839776
    Update is_structured.md (#4472) thetimr 2024-10-07 22:53:32 -0600
  • f52147f49a
    Update is_structured.md thetimr 2024-10-07 15:46:53 -0600
  • 371ee4bc26 doc: Fix JSON Pointer example to use direct initialization kfwu 2024-09-25 19:49:48 +0800
  • e37148ccff Initial commit pavithra0077 2024-09-22 12:48:55 +0000
  • 68c4e54e3f Feat: add CPack support zjyhjqs 2024-09-17 16:24:33 +0800
  • ba6d78ba67 CMake: use conventional prefix and incluedir variables in pkg-config Dylan Baker 2024-09-09 11:02:00 -0700
  • b65e362b26 meson: add support for the ImplictConversions option Dylan Baker 2024-09-09 10:24:51 -0700
  • a575f8cbde meson: add support for the GlobalUDLs option Dylan Baker 2024-09-09 10:20:00 -0700
  • b6520e10e9 CMake: fix typo in JSON_GlobalUDLs description Dylan Baker 2024-09-09 10:20:47 -0700
  • 16dca3c6dd meson: handle single header and multiheader the same way CMake does Dylan Baker 2024-09-09 10:07:07 -0700
  • 672b577495 CMake: configure pkg-config with @only Dylan Baker 2024-09-09 10:55:39 -0700
  • a29af9c381 meson: set the C++ standard to C++11 Dylan Baker 2024-09-09 10:13:59 -0700