Commit Graph

  • 4ce31695f1 Fixed formatting, trying to fix msvc build error in appveyor Artöm Bakri Al-Sarmini 2020-04-08 00:26:43 +03:00
  • c6b298799a 👷 remove failing Travis workers Niels Lohmann 2020-04-07 09:09:44 +02:00
  • 34cf7b7a48 just restart ci chenguoping 2020-04-07 10:00:21 +08:00
  • 5607dfb48a appveyor.yml: Compile and test with latest version for __cplusplus macro on MSVC Thomas Braun 2019-10-23 14:07:19 +02:00
  • 6a53a95c32 ⬆️ Hedley 13 Niels Lohmann 2020-03-19 11:08:02 +01:00
  • 3884d33c60 Merge pull request #1980 from linev/fix_warning Niels Lohmann 2020-04-05 22:00:41 +02:00
  • 554e8c7356 Merge pull request #2002 from alexandermyasnikov/develop Niels Lohmann 2020-04-05 21:58:21 +02:00
  • 5c00308de7 Merge pull request #2010 from magamig/patch-1 Niels Lohmann 2020-04-05 21:55:47 +02:00
  • 83e36f314f Merge pull request #2008 from garethsb-sony/implicit-cast-vs2019 Niels Lohmann 2020-04-05 21:53:47 +02:00
  • 379ed1f67e 💰 add sponsor Niels Lohmann 2020-04-05 15:23:00 +02:00
  • a74a031bba Fix build error Artöm Bakri Al-Sarmini 2020-04-02 15:47:08 +03:00
  • e4d8dc02e8 Fixes #1971 (memory leak in basic_json::push_back) Artöm Bakri Al-Sarmini 2020-04-02 15:20:25 +03:00
  • 3df622a417 Update LICENSE.MIT Miguel Magalhães 2020-03-25 17:24:23 +00:00
  • e07686f0c7 update array_index() and add testcases chenguoping 2020-03-25 15:56:45 +08:00
  • 2e7d340dad docs:modify the document about operator== chenguoping 2020-03-25 10:12:19 +08:00
  • 7fe16f9400 PR for #2006 to test in AppVeyor. garethsb-sony 2020-03-24 12:53:59 +00:00
  • dcd3a6c62b move the catch of std::invalid_argument into array_index() chenguoping 2020-03-23 17:24:47 +08:00
  • 59cb4c93be fix C26451 warnning in serializer.hpp for VS2019 chenguoping 2020-03-23 16:08:47 +08:00
  • 0a8216890d fix C26451 warnnings in to_chars.hpp chenguoping 2020-03-23 15:27:35 +08:00
  • 4df7dc04f6 fix error 'setw' is not a member of 'std' in Wandbox example Alexander Myasnikov 2020-03-21 18:34:40 +03:00
  • 78e911b8c3 Use array_idx as methods args Sergey Linev 2020-03-19 11:52:40 +01:00
  • 19843b038c Merge pull request #1933 from dota17/dota17-FAQ Niels Lohmann 2020-03-19 11:25:47 +01:00
  • ebb5a4c09f 💰 add sponsor Niels Lohmann 2020-03-19 11:14:50 +01:00
  • bfc003cadf catch exceptions for json_point : /xx/+99 chenguoping 2020-03-17 20:49:28 +08:00
  • 2ccdfebaa7 fix typo chenguoping 2020-03-14 18:10:55 +08:00
  • 54656ef279 Merge pull request #1956 from dota17/dota17-fix-typo Niels Lohmann 2020-03-13 17:26:24 +01:00
  • d102da61ad Merge pull request #1979 from alex-weej/patch-2 Niels Lohmann 2020-03-13 16:49:13 +01:00
  • 00049c20d0 Rename argument array_index to array_indx in json_pointer methods Sergey Linev 2020-03-11 07:41:53 +01:00
  • 5fdb1d08aa README: Fix string representation of dumped json Alexander “weej” Jones 2020-03-10 19:37:20 +00:00
  • 41b0704ce1 removed move assignments from input adapters Francois Chabot 2020-03-02 23:50:01 -05:00
  • 7eadd6daef added back forward declaration to address warnings Francois Chabot 2020-02-28 18:15:11 -05:00
  • 699e0a923c fix typo in examples dota17 2020-02-26 13:44:08 +08:00
  • c7282d5b1e simpler endian detection for older gcc versions Francois Chabot 2020-02-20 10:19:29 -05:00
  • 770ae6e9da accomodate older gcc Francois Chabot 2020-02-19 16:54:09 -05:00
  • de35fad88e fixed missing return arg of operator=() Francois Chabot 2020-02-19 15:23:49 -05:00
  • 2e2cf02cfd duck-typed object input adapters Francois Chabot 2020-02-19 14:59:31 -05:00
  • a0c4fc945a fixed bad friend class declaration Francois Chabot 2020-02-19 11:23:02 -05:00
  • 617b3cf42e templated input adapters Francois Chabot 2020-02-19 10:32:49 -05:00
  • 42566c6bef Update README.md Chen 2020-02-17 15:40:52 +08:00
  • 61b46a56fb 🏗️ replace is_pod by is_trivial Niels Lohmann 2020-02-15 10:12:27 +01:00
  • 88097a250f Update README.md : add a FAQ about memory release Chen 2020-02-10 21:03:57 +08:00
  • 973c52dd4a Merge pull request #1923 from Coeur/typos Niels Lohmann 2020-02-02 14:48:07 +01:00
  • 8d92ca865f Some typos Antoine Cœur 2020-02-02 17:29:37 +08:00
  • 6a6790ab68 Merge pull request #1917 from jothepro/update-links-to-hunter Niels Lohmann 2020-01-31 11:47:42 +01:00
  • 3eb6b0e7a2 Merge pull request #1918 from kastiglione/patch-1 Niels Lohmann 2020-01-31 11:46:53 +01:00
  • f25a1287f9 Fix link to parse function in README Dave Lee 2020-01-29 14:19:00 -08:00
  • 0257533866 Updated links to hunter repo & docs jothepro 2020-01-29 22:33:59 +01:00
  • 6ca5338a0c Merge pull request #1909 from Klaim/patch-1 Niels Lohmann 2020-01-28 19:00:45 +01:00
  • ab538ba523 Formatting Joël Lamotte 2020-01-21 17:49:23 +01:00
  • 708e107d8e Adds instruction for using Build2's package manager Joël Lamotte 2020-01-20 14:50:15 +01:00
  • ad383f66bc Merge pull request #1907 from pauljurczak/patch-1 Niels Lohmann 2020-01-19 22:45:53 +01:00
  • bc95563814 Update README.md Paul Jurczak 2020-01-18 14:25:03 -07:00
  • 7acf6218b6 📝 fix typo #1903 Niels Lohmann 2020-01-15 17:40:03 +01:00
  • 0feea6168d 📝 fix scanner documentation Niels Lohmann 2020-01-12 10:22:11 +01:00
  • 6b31375c7c ⚗️ set CXXFLAGS Niels Lohmann 2019-12-19 12:25:27 +01:00
  • a2fea87ef6 Merge pull request #1872 from remedi/feature/optional Niels Lohmann 2019-12-18 10:59:57 +01:00
  • 1b846c9d81 Use JSON_HAS_CPP_17 only after it has been defined Markus Palonen 2019-12-17 16:25:35 +02:00
  • bde5712418 Merge pull request #1871 from sonulohani/develop Niels Lohmann 2019-12-16 15:06:47 +01:00
  • 4c1ebb4413 Fix warning: ignoring return value Sonu Lohani 2019-12-16 14:22:41 +05:30
  • b568619c4a 💰 add sponsor section Niels Lohmann 2019-12-15 19:26:51 +01:00
  • bccc8f0577 Merge pull request #1857 from gocarlos/develop Niels Lohmann 2019-12-01 11:53:24 +01:00
  • ac9df48453 style: format readme Carlos Gomes Martinho 2019-12-01 10:23:24 +01:00
  • f44e8ac090 revert: adding conan badge Carlos Gomes Martinho 2019-12-01 10:22:48 +01:00
  • 134a5faa2b docs: add central repository as conan source to readme Carlos Gomes Martinho 2019-11-29 13:49:53 +01:00
  • 713038fa27 💚 overwork tests Niels Lohmann 2019-11-23 14:40:15 +01:00
  • 1359c56137 🏁 fix <optional> inclusion Niels Lohmann 2019-11-23 13:29:47 +01:00
  • c3270ac734 Merge pull request #1853 from podsvirov/readme-msys2-package-rename Niels Lohmann 2019-11-23 09:21:52 +01:00
  • f586bc014f README: Package in MSYS2 renamed to nlohmann-json Konstantin Podsvirov 2019-11-23 05:02:20 +03:00
  • df30a0ea07 🚧 conversions for std::optional Niels Lohmann 2019-11-23 00:21:33 +01:00
  • c0f52edbc3 📝 add badges Niels Lohmann 2019-11-22 21:17:31 +01:00
  • a4c01f3380 👥 add GitHub Sponsors Niels Lohmann 2019-11-22 20:58:44 +01:00
  • 3f044dad81 📝 add Xocde 11.2.1 to CI list Niels Lohmann 2019-11-22 08:00:41 +01:00
  • 28b1448508 👷 add Xcode 11.2.1 Niels Lohmann 2019-11-21 22:22:06 +01:00
  • 7439cfe5c8 Merge pull request #1844 from Tridacnid/develop Niels Lohmann 2019-11-19 19:27:14 +01:00
  • b2bec943d1 Merge pull request #1846 from Mike-Bal/fix_warnings Niels Lohmann 2019-11-19 19:24:36 +01:00
  • 25e0175bc3 Remove unnecessary warning suppressions in test cmake file Michael Balszun 2019-11-19 11:26:35 +01:00
  • 5c045f7d0a Use correct accumulator type in binary_writer if size_t != ul Michael Balszun 2019-11-19 10:52:09 +01:00
  • fbb0bd7556 Update tests that generate CMake projects to use the CMAKE_CXX_COMPILER the main project was CMake'd with. Fixes #1747. Joe Burzinski 2019-11-18 21:45:14 -06:00
  • e7b3b40b5a Merge branch 'release/3.7.3' into develop v3.7.3 Niels Lohmann 2019-11-17 12:21:44 +01:00
  • 456478b3c5 Merge branch 'release/3.7.3' Niels Lohmann 2019-11-17 12:21:32 +01:00
  • c5eafe74e8 🔖 set version to 3.7.3 Niels Lohmann 2019-11-17 12:09:12 +01:00
  • c6e1e26018 Merge pull request #1838 from nickaein/fix-quadratic-destruction Niels Lohmann 2019-11-15 07:02:12 +01:00
  • efa13c663d Reserve stack only for top-level items Isaac Nickaein 2019-11-13 15:23:08 +03:30
  • 948f98cf4a Cleanups Isaac Nickaein 2019-11-12 22:24:11 +03:30
  • 0f3ec003bb Remove harmful vector::reserve during destruction (#1837) Isaac Nickaein 2019-11-12 22:19:55 +03:30
  • be61ad1470 🎨 fix inconsistent operator style Niels Lohmann 2019-11-11 21:37:32 +01:00
  • 411158d896 Merge branch 'release/3.7.2' into develop v3.7.2 Niels Lohmann 2019-11-10 21:39:14 +01:00
  • 5f09b502b6 Merge branch 'release/3.7.2' Niels Lohmann 2019-11-10 21:39:02 +01:00
  • 56109eacd7 🔖 set version to 3.7.2 Niels Lohmann 2019-11-10 21:23:39 +01:00
  • 7b0c50b9a5 🔨 add path Niels Lohmann 2019-11-10 19:09:48 +01:00
  • 0a513a35cb Merge pull request #1436 from nickaein/iterate-on-destruction Niels Lohmann 2019-11-10 11:57:06 +01:00
  • 7e2445a0f4 Move deep JSON test to a separate unit-test Isaac Nickaein 2019-11-09 21:42:39 +03:30
  • 68d0a7b246 Reduce depth in unit-test to avoid choking valgrind Isaac Nickaein 2019-11-09 21:19:12 +03:30
  • eec1974218 Merge remote-tracking branch 'nlohmann/develop' into iterate-on-destruction Isaac Nickaein 2019-11-09 14:50:48 +03:30
  • 67259d698f Merge pull request #1830 from nlohmann/whitesource/configure Niels Lohmann 2019-11-08 14:04:27 +01:00
  • 760076abca Add .whitesource configuration file whitesource-bolt-for-github[bot] 2019-11-08 13:01:29 +00:00
  • 1a9de88117 🚨 fix a linter warning Niels Lohmann 2019-11-07 08:00:21 +01:00
  • d98bf0278d Merge branch 'release/3.7.1' into develop v3.7.1 Niels Lohmann 2019-11-06 20:34:07 +01:00
  • 43e4db6141 Merge branch 'release/3.7.1' Niels Lohmann 2019-11-06 20:33:52 +01:00
  • aacdc6bbe3 🔖 set version to 3.7.1 Niels Lohmann 2019-11-06 18:37:26 +01:00