mirror/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2024-12-12 03:49:22 +08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity
3,210 Commits 12 Branches 56 Tags 263 MiB
56109eacd7
Commit Graph

3210 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Isaac Nickaein
7e2445a0f4 Move deep JSON test to a separate unit-test 2019-11-09 21:42:39 +03:30
Isaac Nickaein
68d0a7b246 Reduce depth in unit-test to avoid choking valgrind 2019-11-09 21:19:12 +03:30
Isaac Nickaein
eec1974218 Merge remote-tracking branch 'nlohmann/develop' into iterate-on-destruction 2019-11-09 14:50:48 +03:30
Niels Lohmann
67259d698f
Merge pull request #1830 from nlohmann/whitesource/configure 
Configure WhiteSource Bolt for GitHub
 2019-11-08 14:04:27 +01:00
whitesource-bolt-for-github[bot]
760076abca
Add .whitesource configuration file 2019-11-08 13:01:29 +00: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
Anthony VH
c4923e3d05 Merge remote-tracking branch 'upstream/develop' into develop 2019-11-04 20:50:43 +01:00
Anthony VH
ec9647ae63 Moved test for #1647 regression to regressions file. 2019-11-04 20:45:24 +01:00
Camille Bégué
8b686b30eb Add restriction for tuple specialization of to_json 
This commit fix the issue #1825

Signed-off-by: Camille Bégué <c.begue@samsung.com>
 2019-11-04 09:57:16 +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
Camille Bégué
794a3d411a Fix issue #1805 
* Add some restriction on pair partial specialization of to_json

Signed-off-by: Camille Bégué <camille.begue.pro@gmail.com>
 2019-10-31 18:04:15 +01:00
Anthony Van Herrewege
ddda67a096 Don't capture json input by value (fixed #1822). 2019-10-30 16:16:34 +01:00
Anthony Van Herrewege
fb9a2643c8 Add test for #1647. 2019-10-30 15:46:31 +01:00
Anthony Van Herrewege
27d0dfc17a Fix #1647: non-member operator== breaks enum (de)serialization. 2019-10-30 14:54:52 +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
Florian Pigorsch
b93d414a35 Fix some spelling errors - mostly in comments & documentation. 
I did not touch the Changelog file and any third party stuff.

additonal -> additional (1)
apppend -> append (2)
constuctor -> constructor (2)
contect -> context (2)
dobulequote -> doublequote (1)
elemnts -> elements (1)
exakt -> exact (2)
exluded -> exclude (1)
explicitely -> explicitly (2)
narcissic -> narcissistic (1)
ocurred -> occurred (1)
occuring -> occurring (2)
preceeds -> preceded (1)
ot -> to (2)
wehther -> whether (2)
 2019-10-19 11:59:51 +02:00
Eli Schwartz
f4332d4097
README: describe how to use json as a meson subproject 
Also call out to the guidelines for using pkg-config dependencies first,
and reference it for other build systems as well.

Although the possibility of installing with a pkg-config file is
somewhat hidden away in the meson docs, it's been deemed less invasive
due to not distracting away from cmake. So it will have to do.
 2019-10-17 15:38:06 -04:00
Eli Schwartz
84faa36ec5
release: add singleinclude and meson.build to include.zip 
This serves as a minimal release-only way to embed json into a project.
Add meson support to this directly, to make it usable standalone as a
meson subproject.

Implements #1672
 2019-10-17 15:26:51 -04: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
Evan Nemerson
fbcbc76d10 Update Hedley to v11. 2019-10-16 13:39:40 -07:00
Thomas Braun
c6cbdf96a9 appveyor.yml: Add debug build on x64 and VS 2019 2019-10-16 22:34:33 +02:00
Thomas Braun
01e486bb55 appveyor.yml: Add MSVC 16 2019 support 2019-10-16 22:34:33 +02:00
Thomas Braun
35b47c2793 iteration_proxy: Fix integer truncation from std::size_t to int 
Bug introduced in 0f073e26 (Allow items() to be used with custom string,
2019-09-26).
 2019-10-16 20:00:05 +02:00
Thomas Braun
5541a2bd25 test/cmake_import: Pass the generator platform required by MSVC 2019 2019-10-16 17:10:19 +02:00
Thomas Braun
7a521150aa appveyor: Pass the generator platform explicitly 
In a future commit we want to add support for MSVC 2019. For that
version cmake requires us to pass in the architecture not part of the
generator but explicitly.

So let's pass that in always like that. This also removes the doubling
of the platform/architecture.
 2019-10-16 17:10:19 +02:00