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
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
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
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
Thomas Braun
eb6fe421ae
test/CMakeLists.txt: Use an explicit list instead of GLOB
...
Using GLOB is slow and considered bad practice.
From https://cmake.org/cmake/help/latest/command/file.html :
> We do not recommend using GLOB to collect a list of source files from
> your source tree. If no CMakeLists.txt file changes when a source is
> added or removed then the generated build system cannot know when to ask
> CMake to regenerate. The CONFIGURE_DEPENDS flag may not work reliably on
> all generators, or if a new generator is added in the future that cannot
> support it, projects using it will be stuck. Even if CONFIGURE_DEPENDS
> works reliably, there is still a cost to perform the check on every
> rebuild.
2019-10-07 21:13:09 +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
Julien Hamaide
4615f5a980
Provide default implementation for int_to_string, but allow for overloaded function
2019-10-01 10:34:21 +02:00
christian
7476f5ee0c
Make json_pointer::back const ( resolves #1764 )
2019-10-01 00:57:27 +02:00
0xflotus
d7579b8cbf
did you mean 'serialization'?
2019-09-30 18:11:44 +02:00
Julien Hamaide
0f073e26eb
Allow items() to be used with custom string
2019-09-26 13:20:57 +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
Xav83
87afee1c39
Runs make amalgamate on the project.
2019-09-20 11:45:38 +02:00
Xav83
13a7c60257
Correct a warning from cppcheck:
...
binary_writer.hpp:869: (style) Consider using std::accumulate algorithm instead of a raw loop.
910a7d2b87/checks (step)
2019-09-20 11:45:38 +02:00
Xav83
b9dfdbe6be
Correct a warning from cppcheck:
...
binary_reader.hpp:650: (style) Unsigned expression 'mant' can't be negative so it is unnecessary to test it
910a7d2b87/checks (step)
2019-09-19 19:25:55 +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
Miguel Sacristan
e26a2904fc
Fix and add test's for SFINAE problem
2019-09-10 21:36:23 +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
Thomas Braun
8067c3ca5b
Add serialization unit tests for extreme integer values
2019-09-03 13:55:19 +02:00
