wt/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2026-10-01 05:23:47 +07:00
Code Issues Packages Projects Releases Wiki Activity
3,217 Commits 82 Branches 57 Tags
c5eafe74e89a6695b8b06598867937846be48891
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Niels Lohmann c5eafe74e8 🔖 set version to 3.7.3 2019-11-17 12:09:12 +01:00
Niels Lohmann c6e1e26018 Merge pull request #1838 from nickaein/fix-quadratic-destruction 
Fix quadratic destruction complexity
 2019-11-15 07:02:12 +01:00
Niels Lohmann be61ad1470 🎨 fix inconsistent operator style 2019-11-11 21:37:32 +01:00
Niels Lohmann 411158d896 Merge branch 'release/3.7.2' into develop 2019-11-10 21:39:14 +01:00
Niels Lohmann 56109eacd7 🔖 set version to 3.7.2 2019-11-10 21:23:39 +01:00
Niels Lohmann 7b0c50b9a5 🔨 add path 2019-11-10 19:09:48 +01:00
Niels Lohmann 0a513a35cb Merge pull request #1436 from nickaein/iterate-on-destruction 
Prevent stackoverflow caused by recursive deconstruction
 2019-11-10 11:57:06 +01:00
Niels Lohmann 67259d698f Merge pull request #1830 from nlohmann/whitesource/configure 
Configure WhiteSource Bolt for GitHub
 2019-11-08 14:04:27 +01:00
Niels Lohmann 1a9de88117 🚨 fix a linter warning 
Coverity detected two "Memory - illegal accesses  (OVERRUN)" issues. Resizing the buffer should silence this warning.
 2019-11-07 08:00:21 +01:00
Niels Lohmann d98bf0278d Merge branch 'release/3.7.1' into develop 2019-11-06 20:34:07 +01:00
Niels Lohmann aacdc6bbe3 🔖 set version to 3.7.1 2019-11-06 18:37:26 +01:00
Niels Lohmann 0f6a58eeaf 👥 update contributors 2019-11-06 17:35:04 +01:00
Niels Lohmann 1e9f16dff0 🚨 fix linter errors 2019-11-05 20:25:53 +01:00
Niels Lohmann c0ae88bf50 🚨 fix linter errors 2019-11-05 20:23:17 +01:00
Niels Lohmann 62dada05ca 🐛 fix conversion to std::valarray 
closes #1824
 2019-11-05 19:28:00 +01:00
Niels Lohmann 7bcaba0ca9 Merge pull request #1821 from AnthonyVH/develop 
Fix for #1647
 2019-11-05 19:15:54 +01:00
Niels Lohmann 1ca6f2901b Merge pull request #1826 from cbegue/develop 
Add restriction for tuple specialization of to_json
 2019-11-05 19:14:37 +01:00
Niels Lohmann abccafa5c5 ⬆️ upgrade Doctest to 2.3.5 2019-11-05 19:11:54 +01:00
Niels Lohmann 3790bd9ae0 👷 add Xcode 10.2 2019-11-04 06:22:39 +01:00
Niels Lohmann 42e9ad32c6 🔨 remove full path 2019-11-03 21:49:22 +01:00
Niels Lohmann e779714dd8 👷 add Xcode 10.2 2019-11-03 20:45:21 +01:00
Niels Lohmann bf2afaeee6 🔊 add version output 2019-11-03 20:27:07 +01:00
Niels Lohmann 6a4cc29f01 📝 update examples 2019-11-03 19:40:38 +01:00
Niels Lohmann dfe53c36da 🚨 fix UBSAN warnings 2019-11-03 13:48:25 +01:00
Niels Lohmann 0db1692f45 👥 update contributors 2019-11-02 10:24:06 +01:00
Niels Lohmann 1307862b1d Merge pull request #1694 from eli-schwartz/release-include-meson 
release: add singleinclude and meson.build to include.zip
 2019-11-02 09:28:51 +01:00
Niels Lohmann 4d1e4c6d93 Merge pull request #1780 from t-b/add-msvc-16-2019 
appveyor.yml: Add MSVC 16 2019 support
 2019-11-02 08:16:53 +01:00
Niels Lohmann a1828bbf57 Merge pull request #1806 from cbegue/develop 
Fix issue #1805
 2019-11-01 19:46:19 +01:00
Niels Lohmann f272ad533d 👥 add CODEOWNERS file 2019-10-23 21:41:12 +02:00
Niels Lohmann f7e7a62358 📝 add comment on JSON_THROW_USER, JSON_TRY_USER, and JSON_CATCH_USER 2019-10-23 20:58:06 +02:00
Niels Lohmann 507d5676ad 🚨 fix warning 2019-10-23 20:57:10 +02:00
Niels Lohmann 00cb98a3d1 Merge pull request #1803 from flopp/spelling 
Fix some spelling errors - mostly in comments & documentation.
 2019-10-21 20:50:13 +02:00
Niels Lohmann 0245ae5157 Merge pull request #1797 from t-b/fix-integer-truncation 
iteration_proxy: Fix integer truncation from std::size_t to int
 2019-10-17 21:02:48 +02:00
Niels Lohmann 4c06191836 Merge pull request #1799 from nemequ/develop 
Update Hedley to v11.
 2019-10-17 20:59:49 +02:00
Niels Lohmann ed5541440a Merge pull request #1779 from t-b/avoid-using-glob-in-cmake 
test/CMakeLists.txt: Use an explicit list instead of GLOB
 2019-10-09 07:37:43 +02:00
Niels Lohmann d187488e0d Merge pull request #1765 from crazyjul/fix/items-with-alt-string 
Allow items() to be used with custom string
 2019-10-05 22:11:14 +02:00
Niels Lohmann dae0fe79af Merge pull request #1769 from chris0x44/json_pointer 
Make json_pointer::back const (resolves #1764)
 2019-10-03 10:35:34 +02:00
Niels Lohmann d826282f53 Merge pull request #1767 from 0xflotus/patch-1 
did you mean 'serialization'?
 2019-10-01 11:32:05 +02:00
Niels Lohmann 99d7518d21 📝 add OSS Fuzz status badge 2019-09-24 21:01:06 +02:00
Niels Lohmann e2c531a1f7 Merge pull request #1760 from Xav83/cppcheckFixes 
Cppcheck fixes
 2019-09-24 20:42:38 +02:00
Niels Lohmann 771d5dadc6 Merge pull request #1741 from tete17/Fix-SFINAE 
Fix and add test's for SFINAE problem
 2019-09-16 22:39:42 +02:00
Niels Lohmann 06ccd43a2a Merge pull request #1722 from t-b/fix-int64-min-issue 
Fix int64 min issue
 2019-09-10 07:58:02 +02:00
Niels Lohmann a6bd798bfa Merge pull request #1728 from t-b/fix-clang-sanitizer-invocation 
Fix clang sanitizer invocation
 2019-09-10 07:50:02 +02:00
Niels Lohmann eab68e7750 👷 add test step 2019-09-02 22:15:11 +02:00
Niels Lohmann 90c1c24ccb 👷 try GitHub Actions 2019-09-02 21:35:53 +02:00
Niels Lohmann bf4156056b ✏️ fix a typo 2019-08-27 20:18:04 +02:00
Niels Lohmann b6ee34cc99 Merge branch 'develop' of https://github.com/nlohmann/json into develop 2019-08-27 20:03:05 +02:00
Niels Lohmann 7dccfa5355 Merge pull request #1724 from t-b/enhance-travis 
Add gcc 9 and compile with experimental C++20 support
 2019-08-27 19:57:23 +02:00
Niels Lohmann fe618ac246 👷 adjust maintainer scripts 2019-07-29 18:49:21 +02:00
Niels Lohmann a015b78e81 🔒 add security policy 2019-07-28 21:46:32 +02:00
Niels Lohmann 6291803f59 👥 update contributors 2019-07-28 21:31:17 +02:00
Niels Lohmann 53c3eefa2c Merge branch 'release/3.7.0' into develop 2019-07-28 21:23:36 +02:00
Niels Lohmann d275d05514 📝 update documentation 2019-07-28 20:54:02 +02:00
Niels Lohmann ddb7f70a12 📝 update documentation 2019-07-28 20:53:18 +02:00
Niels Lohmann 48e1fe03b5 🔖 set version to 3.7.0 2019-07-28 20:20:41 +02:00
Niels Lohmann 66d63abe6d Update Makefile 2019-07-28 18:40:11 +02:00
Niels Lohmann d4fd731f1f 🔨 fix release target 2019-07-28 17:55:01 +02:00
Niels Lohmann d80f8b09f5 🔨 adjust version 2019-07-28 15:20:07 +02:00
Niels Lohmann 7bf8a86090 🔨 adjust paths 2019-07-28 14:30:17 +02:00
Niels Lohmann 65e4b973bd 🔥 remove leftover file 2019-07-21 14:10:37 +02:00
Niels Lohmann 323cf95d8c 🚨 fix linter warning 2019-07-21 14:04:49 +02:00
Niels Lohmann ffe0e3d70f Merge pull request #1673 from remyabel/gnuinstalldirs 
Use GNUInstallDirs instead of hard-coded path.
 2019-07-17 06:28:38 +02:00
Niels Lohmann cf8251eb54 🚑 fix compiler errors 2019-07-14 21:19:55 +02:00
Niels Lohmann 6c7cde181c Merge branch 'develop' of https://github.com/nlohmann/json into develop 2019-07-14 20:58:29 +02:00
Niels Lohmann a501365ea2 Merge branch 'feature/hedley' into develop 2019-07-14 20:58:08 +02:00
Niels Lohmann 8d059b96a1 Merge pull request #1670 from podsvirov/readme-package-managers-msys2 
Package Manager: MSYS2 (pacman)
 2019-07-13 17:58:08 +02:00
Niels Lohmann b17440c12f 🚨 fix compiler warnings 2019-07-12 21:05:16 +02:00
Niels Lohmann 104c5c1996 Merge branch 'feature/json_pointer_contains' into develop 2019-07-09 08:08:56 +02:00
Niels Lohmann 7a23aa1c0d Merge branch 'feature/emplace_back' into develop 2019-07-09 08:06:27 +02:00
Niels Lohmann 24fa285edb 📝 remove HEDLEY annotation from documentation 2019-07-02 21:15:52 +02:00
Niels Lohmann 947656544d 🚨 fix warnings 2019-07-02 21:06:42 +02:00
Niels Lohmann 346e9813c5 🚧 add more annotations 2019-07-02 20:25:51 +02:00
Niels Lohmann 9289a23a76 Merge pull request #1643 from kevinlul/develop 
Fix json.hpp compilation issue with other typedefs with same name (Issue #1642)
 2019-07-01 22:57:04 +02:00
Niels Lohmann 90798caa62 🚚 rename Hedley macros 2019-07-01 22:37:30 +02:00
Niels Lohmann 025f4cea42 🚨 fix warning 2019-07-01 22:29:21 +02:00
Niels Lohmann 897362191d 🔨 add NLOHMANN_JSON prefix and undef macros 2019-07-01 22:24:39 +02:00
Niels Lohmann 1720bfedd1 ⚗️ add Hedley annotations 2019-06-30 22:14:02 +02:00
Niels Lohmann 1be63431f3 ✨ make emplace_back return a reference #1609 2019-06-30 12:19:41 +02:00
Niels Lohmann 258fa798f1 ✨ add contains function for JSON pointers 2019-06-30 10:03:08 +02:00
Niels Lohmann 9a775bcb14 Merge pull request #1570 from nickaein/msvc-regression-tests 
Regression tests for MSVC
 2019-06-25 07:05:53 +02:00
Niels Lohmann 39011a1759 📝 mention json type in documentation start page #1616 2019-06-22 09:54:59 +02:00
Niels Lohmann 3b82a350ed 📝 mention 302 exception in value() documentation #1601 2019-06-22 09:44:12 +02:00
Niels Lohmann 13d4f8f5ad Merge pull request #1639 from taylorhoward92/develop 
Add explicit conversion from json to std::string_view in conversion unit test
 2019-06-22 09:25:02 +02:00
Niels Lohmann 4fc98e0b34 Merge pull request #1625 from nickaein/fix-docs 
Minor fixes in docs
 2019-06-05 20:25:48 +02:00
Niels Lohmann 17c0849a63 Merge pull request #1585 from Macr0Nerd/iss916 
Added to_string and added basic tests
 2019-05-24 09:20:15 +02:00
Niels Lohmann 9f2179deb1 Merge pull request #1598 from nickaein/patch-2 
Fix broken links to documentation
 2019-05-24 09:16:38 +02:00
Niels Lohmann ee4028b8e4 Merge branch 'feature/fastcov' into develop 2019-04-06 09:15:43 +02:00
Niels Lohmann cf6b6692aa Merge branch 'develop' into feature/fastcov 2019-04-06 09:03:35 +02:00
Niels Lohmann f0bc16d899 🔨 overworked coverage targets 2019-04-06 09:02:17 +02:00
Niels Lohmann b4b06d89b5 ⬆️ updated fastcov 2019-04-06 00:24:19 +02:00
Niels Lohmann e65cff2a8f 🔨 small cleanup 2019-04-05 23:31:04 +02:00
Niels Lohmann 63fe1cbbcf 📝 updated README 2019-04-05 18:29:57 +02:00
Niels Lohmann 0bdadb12c7 Merge branch 'feature/circleci' into develop 2019-04-05 17:50:48 +02:00
Niels Lohmann 0a1ddd6882 ⬆️ updated fastcov 2019-04-05 07:54:46 +02:00
Niels Lohmann 4676f759e8 ⬆️ updated fastcov 2019-04-04 09:50:27 +02:00
Niels Lohmann da279234d5 Merge branch 'develop' into feature/fastcov 2019-04-04 09:03:11 +02:00
Niels Lohmann f05614b240 🏗️ adding anonymous namespace 2019-04-04 08:56:36 +02:00
Niels Lohmann 0da99027b7 🚨 silenced a warning 2019-04-03 17:44:09 +02:00
Niels Lohmann 1f03395e2c Merge branch 'develop' of https://github.com/nlohmann/json into develop 2019-04-03 17:28:50 +02:00
Niels Lohmann 2f9095ddab 🔨 relaxed requirements to coverage 2019-04-03 17:28:47 +02:00