Commit Graph

  • 433da31334 ⚗️ try to use GCC 10 Niels Lohmann 2020-12-29 20:16:51 +01:00
  • 7b98df515f add regression test Niels Lohmann 2020-12-29 14:48:18 +01:00
  • 98b2152452 Merge branch 'develop' of https://github.com/nlohmann/json into std_bytes Niels Lohmann 2020-12-29 14:37:46 +01:00
  • ff3863dc1d Merge pull request #2553 from jasujm/jasujm/input_adapter_custom_container Niels Lohmann 2020-12-29 14:37:20 +01:00
  • 467f622c65 Fix compilation of input_adapter(container) in edge cases Jaakko Moisio 2020-12-28 22:20:37 +01:00
  • 5dd06714b1 🐛 allow parsing from std::byte containers #2546 Niels Lohmann 2020-12-28 11:31:21 +01:00
  • dfedefb993 🚨 fix warnings Niels Lohmann 2020-12-26 17:56:16 +01:00
  • 903b8a6e04 Build as "Debug" for coverage test Alexander Karzhenkov 2020-12-26 21:14:16 +05:00
  • f15d447522 🚨 fix warnings Niels Lohmann 2020-12-26 14:55:19 +01:00
  • 10db9184a3 Configure Travis to build "Release" instead of "Debug" Alexander Karzhenkov 2020-12-23 20:55:02 +05:00
  • 7092890ff1 Properly select the build type for Travis Alexander Karzhenkov 2020-12-22 18:03:50 +05:00
  • 5e55158d60 Merge branch 'develop' of https://github.com/nlohmann/json into feature/optional Niels Lohmann 2020-12-21 20:59:41 +01:00
  • f78d456075 Merge pull request #2540 from karzhenkov/disrupt-cxx17-tests Niels Lohmann 2020-12-21 20:58:06 +01:00
  • 9493f4beb1 Advance gcc library version for clang++-7 Alexander Karzhenkov 2020-12-20 23:50:28 +05:00
  • cd7acc1dc5 Include <string_view> in "nlohmann/json.hpp" when C++17 is used Alexander Karzhenkov 2020-12-20 19:40:36 +05:00
  • 39b8d6bd33 Restore intentionally disrupted C++17 tests Alexander Karzhenkov 2020-12-20 12:43:35 +05:00
  • aae0e4959e Fix travis configuration to enable C++17 tests Alexander Karzhenkov 2020-12-20 10:18:41 +05:00
  • 8247a217bb Disrupt all C++17 tests to check if they are executed Alexander Karzhenkov 2020-12-19 17:23:58 +05:00
  • c3c574cf96 Merge pull request #2538 from YarikTH/feature/doctest_v2.4.3 Niels Lohmann 2020-12-18 22:10:42 +01:00
  • a1772743a1 Doctest is updated to v2.4.3 Krylov Yaroslav 2020-12-18 07:27:22 +03:00
  • 8593260044 Merge pull request #2537 from nlohmann/fix_warnings Niels Lohmann 2020-12-17 21:48:16 +01:00
  • c026e1a475 🚨 fix warnings Niels Lohmann 2020-12-16 21:44:35 +01:00
  • af8c6e7aa9 Merge pull request #2533 from nlohmann/c++_future Niels Lohmann 2020-12-16 20:54:09 +01:00
  • 5c1a5bc9c1 Merge pull request #2534 from nlohmann/clarify_license Niels Lohmann 2020-12-16 20:53:38 +01:00
  • 45810082d4 Merge pull request #2536 from nlohmann/shadowing Niels Lohmann 2020-12-16 20:52:46 +01:00
  • 5cc5285fe8 🚨 fix shadowing warning Niels Lohmann 2020-12-15 22:15:36 +01:00
  • 94d177e09a 📄 clarify license Niels Lohmann 2020-12-14 14:58:59 +01:00
  • 467986fe98 ♻️ do not unconditionally redefine C++14 constructs Niels Lohmann 2020-12-14 14:31:27 +01:00
  • 2fc1f694ad Merge pull request #2514 from globberwops/develop Niels Lohmann 2020-12-14 13:41:46 +01:00
  • 1771e9249f Remove comment on CTest inclusion Martin Stump 2020-12-14 10:59:38 +01:00
  • 85ffc85a29 🎨 amalgamate code Niels Lohmann 2020-12-14 10:38:49 +01:00
  • ea759d0360 Compare to CMAKE_CURRENT_SOURCE_DIR for main project check Martin Stump 2020-12-13 20:34:51 +01:00
  • 97fe455ad5 Merge branch 'develop' of https://github.com/nlohmann/json into develop Niels Lohmann 2020-12-12 17:17:43 +01:00
  • d028eff9e1 📦 add license to include.zip #2487 Niels Lohmann 2020-12-12 17:17:38 +01:00
  • be32cc4f5e Merge pull request #2525 from YarikTH/feature/doctest_v2.4.1 Niels Lohmann 2020-12-12 15:08:55 +01:00
  • 47c2004f7f Merge branch 'develop' of https://github.com/nlohmann/json into develop Niels Lohmann 2020-12-12 14:10:05 +01:00
  • fc4040ce9d 🔨 clean up CI Niels Lohmann 2020-12-12 14:09:50 +01:00
  • 6390fca71a Doctest is updated to v2.4.1 Krylov Yaroslav 2020-12-12 05:27:03 +03:00
  • 260be043ba Merge pull request #2406 from leozz37/develop Niels Lohmann 2020-12-11 14:47:18 +01:00
  • 5026acd70c Merge pull request #2444 from linev/fix_gcc48_warn Niels Lohmann 2020-12-11 13:46:41 +01:00
  • 30dd0c0f09 Change underscore placement Sergey Linev 2020-12-11 13:43:17 +01:00
  • 3ad6992f50 Merge pull request #2405 from karzhenkov/fix-json_ref-move Niels Lohmann 2020-12-11 13:36:33 +01:00
  • e3643aadf7 Merge pull request #2447 from jbzdarkid/develop Niels Lohmann 2020-12-11 13:27:52 +01:00
  • d9e2b191ad Merge pull request #2512 from YarikTH/issue2490 Niels Lohmann 2020-12-11 13:21:33 +01:00
  • 790508887e Set MAIN_PROJECT=OFF initially Martin Stump 2020-12-09 12:39:44 +01:00
  • 5c589dd138 Add MAIN_PROJECT check for test and install options Martin Stump 2020-12-09 11:37:01 +01:00
  • 972c15f26e ordered_map::insert(InputIt first, InputIt last) is added Krylov Yaroslav 2020-12-07 20:15:41 +03:00
  • 5155cc2c48 Ranged insert test section is added in unit-ordered_json.cpp Krylov Yaroslav 2020-12-07 19:47:41 +03:00
  • d8d8cbf6e0 🔨 fix site URL Niels Lohmann 2020-12-07 15:30:28 +01:00
  • 3322c9df6e 🔒 use HTTPS Niels Lohmann 2020-12-06 14:41:48 +01:00
  • cde29b3a11 Merge branch 'develop' of https://github.com/nlohmann/json into develop jbzdarkid 2020-12-03 12:47:34 -08:00
  • eaac918034 👷 remove clang9 CI Niels Lohmann 2020-12-02 08:58:45 +01:00
  • 9f45d314d5 Apply suggestions from code review Joseph Blackman 2020-11-24 11:02:58 -08:00
  • 64ff1cf90d Add asserts to suppress C28020 jbzdarkid 2020-10-26 13:57:38 -07:00
  • 71cb7d12da Change argument name "subtype" in byte_container_with_subtype Sergey Linev 2020-10-23 13:52:24 +02:00
  • 42a9dc0bc3 Improve json_ref implementation Alexander Karzhenkov 2020-09-27 10:45:21 +05:00
  • b273f28dae 📝 add CPM.Cmake example leozz37 2020-09-26 19:16:03 -03:00
  • fd7a9f6007 💰 add sponsor Niels Lohmann 2020-09-23 19:55:03 +02:00
  • 1bcabd9e83 📝 fix URLs to documentation Niels Lohmann 2020-09-02 22:25:32 +02:00
  • 1047d09b2a annotate non-reproducible tests #2324 Niels Lohmann 2020-08-30 13:23:34 +02:00
  • d9843fc9fc 📝 add note for Intel compilers #2346 Niels Lohmann 2020-08-29 12:46:47 +02:00
  • 6030a11051 Merge pull request #2367 from nlohmann/hedley14 Niels Lohmann 2020-08-26 08:13:43 +02:00
  • 14f8be11ce Merge branch 'develop' of https://github.com/nlohmann/json into hedley14 Niels Lohmann 2020-08-24 16:12:11 +02:00
  • b9d76516a2 Merge pull request #2363 from nlohmann/issue2360 Niels Lohmann 2020-08-20 11:38:43 +02:00
  • 9d81eedb42 📝 fix and extend documentation of discarded values Niels Lohmann 2020-08-19 20:26:30 +02:00
  • b386f4de0b 📝 fix and extend documentation of discarded values Niels Lohmann 2020-08-19 20:26:06 +02:00
  • 3be6ee3525 🚚 remove < from filename to fix Windows build Niels Lohmann 2020-08-16 21:39:40 +02:00
  • fe507a7ee8 🚚 remove < from filename to fix Windows build Niels Lohmann 2020-08-16 21:36:21 +02:00
  • 6b04f05eba 📝 add more API documentation Niels Lohmann 2020-08-16 21:23:44 +02:00
  • 5c4cc20ed8 📝 add more API documentation Niels Lohmann 2020-08-16 20:48:10 +02:00
  • a430d25f22 📝 add more API documentation Niels Lohmann 2020-08-16 14:48:48 +02:00
  • fb5c20134f 📝 add more API documentation Niels Lohmann 2020-08-16 14:27:26 +02:00
  • d8ed98a7af 📝 add more API documentation Niels Lohmann 2020-08-15 15:18:07 +02:00
  • 1ce0ed5a52 👷 ignore gh-pages branch in CircleCI Niels Lohmann 2020-08-14 13:58:55 +02:00
  • 0c2088823d 👷 ignore gh-pages branch in CircleCI Niels Lohmann 2020-08-14 13:56:42 +02:00
  • fb8adb8e93 👷 ignore gh-pages branch in CircleCI Niels Lohmann 2020-08-14 13:52:42 +02:00
  • f6c2947f1e 📝 add more API documentation Niels Lohmann 2020-08-14 13:47:54 +02:00
  • 0356e0c75b 📝 add more API documentation Niels Lohmann 2020-08-14 13:05:16 +02:00
  • 6674561d6a 📝 add more API documentation Niels Lohmann 2020-08-14 10:48:32 +02:00
  • 772f37c12d Merge pull request #2354 from rbuch/develop Niels Lohmann 2020-08-14 06:04:56 +02:00
  • 67d822d951 Fix typos in documentation Ronak Buch 2020-08-13 15:44:58 -04:00
  • 298420263b 🚚 remove quotes from filename to fix Windows build Niels Lohmann 2020-08-13 15:12:41 +02:00
  • dd2fb3b454 📝 add more API documentation Niels Lohmann 2020-08-13 15:03:28 +02:00
  • ce6adc447a 📝 add more API documentation Niels Lohmann 2020-08-13 14:04:08 +02:00
  • d360fec216 📝 add offline pages for docset Niels Lohmann 2020-08-13 13:35:05 +02:00
  • 178125ff9b 📝 add docset Niels Lohmann 2020-08-13 10:52:20 +02:00
  • 8d0aa09ab5 Merge pull request #2352 from nlohmann/private_macro Niels Lohmann 2020-08-13 10:06:59 +02:00
  • 874f49e945 📝 add more API documentation Niels Lohmann 2020-08-12 14:29:25 +02:00
  • fe89049aee 📝 add more API documentation Niels Lohmann 2020-08-12 13:41:59 +02:00
  • 9d726c25d5 ♻️ remove "#define private public" Niels Lohmann 2020-08-12 13:30:06 +02:00
  • 411fc3249b ⬆️ Hedley 14 (dev branch) Niels Lohmann 2020-08-12 13:00:57 +02:00
  • b888afe5f4 Merge pull request #2349 from nlohmann/issue2348 Niels Lohmann 2020-08-11 09:05:02 +02:00
  • 37ce871eeb Merge pull request #2347 from nlohmann/no_exceptions Niels Lohmann 2020-08-10 22:47:27 +02:00
  • dd8cb2acc1 🚨 remove -Wimplicit-fallthrough warning #2348 Niels Lohmann 2020-08-10 20:48:39 +02:00
  • 4080d0b1a4 add test to compile without exceptions Niels Lohmann 2020-08-10 09:48:11 +02:00
  • 1b28a58280 Merge remote-tracking branch 'origin/develop' into develop Niels Lohmann 2020-08-10 09:24:25 +02:00
  • 824d55bf26 📝 fix documentation #1668 Niels Lohmann 2020-08-10 09:24:11 +02:00
  • e030d26089 Merge pull request #2344 from ongjunjie/fix-cmake-overwrite-compiler Niels Lohmann 2020-08-08 12:15:10 +02:00
  • 41a99567e0 fix cmake script overwriting compiler path Jun Jie 2020-08-07 16:08:02 +08:00
  • fedf82c904 Merge branch 'develop' of https://github.com/nlohmann/json into feature/optional Niels Lohmann 2020-08-07 09:37:56 +02:00