Giovanni Cerretani
28a169725e
Fix -Wunused warnings on JSON_DIAGNOSTICS ( #2976 )
...
* Fix #2975
Define JSON_DIAGNOSTICS to 0 if not defined to fix annoying Wundef warnings.
* amalgamated
2021-08-26 07:35:01 +02:00
Niels Lohmann
1fd2213fd2
Merge branch 'release/3.10.1' into develop
2021-08-24 21:08:43 +02:00
Niels Lohmann
8ad66e9136
🔖 set version to 3.10.1
2021-08-24 20:19:55 +02:00
mb0202
7194245a31
Fixed typo in parse.md ( #2968 )
...
Changed a potential typo: "charater" -> "character"
2021-08-24 08:08:02 +02:00
Niels Lohmann
34e2c4ab88
📝 add link to Homebrew package ( #2966 )
2021-08-22 21:58:37 +02:00
Niels Lohmann
c753165db6
Fix parent update for diagnostics with ordered_json ( #2963 )
...
🐛 fix parent update for diagnostics with ordered_json
2021-08-22 20:30:20 +02:00
Niels Lohmann
f03127eb69
Set stack size for some unit tests when using MSVC ( #2961 )
...
* 🏁 set stack size for some unit tests
2021-08-21 13:55:06 +02:00
Niels Lohmann
cb053bceb1
Merge pull request #2960 from nlohmann/issue2958
...
Add regression test
2021-08-20 16:34:38 +02:00
Niels Lohmann
97c7a35a2b
✅ add regression test
2021-08-20 14:49:58 +02:00
Niels Lohmann
eb6541a30c
Merge pull request #2959 from nlohmann/issue2938
...
Update Travis badge
2021-08-20 13:56:16 +02:00
Niels Lohmann
e8e93ee43b
👷 update Travis badge
2021-08-20 13:53:31 +02:00
Niels Lohmann
611fd22557
Merge pull request #2957 from Hallot/bug/fix-some-clang-warnings
...
Fix some extra ";" clang warnings
2021-08-20 13:32:38 +02:00
Pierre Hallot
433604843d
Fix extra ";" clang warnings
2021-08-19 17:04:34 +02:00
Niels Lohmann
44ffaa052c
Merge pull request #2943 from amirmasoudabdol/patch-1
...
Updating the Homebrew Command
2021-08-19 12:03:52 +02:00
Amir Masoud Abdol
14af5d4a9f
fixing the doc files
2021-08-19 09:31:39 +02:00
Niels Lohmann
273d911252
Merge pull request #2954 from nlohmann/issue2944
2021-08-19 06:37:42 +02:00
Niels Lohmann
55281e03af
📝 add documentation for integration via vcpkg
2021-08-18 21:25:23 +02:00
Niels Lohmann
23e3b622aa
📝 add documentation for integration via vcpkg
2021-08-18 20:49:13 +02:00
Niels Lohmann
abd829e6c6
Merge pull request #2950 from senyai/patch-2
...
🚨 fix gdb_pretty_printer failure on basic types
2021-08-18 20:07:28 +02:00
Niels Lohmann
5cf5ccd108
Merge pull request #2948 from nlohmann/missing_header
...
Add header to use value_t
2021-08-18 20:07:05 +02:00
Niels Lohmann
5a04042cad
Merge pull request #2947 from nlohmann/issue2946
...
Skip some tests if JSON_Install is not set
2021-08-18 20:06:44 +02:00
Niels Lohmann
f8bc22c741
Merge pull request #2945 from nlohmann/issue2941
...
Remove outdated json_unit test binary
2021-08-18 20:06:00 +02:00
Niels Lohmann
de4a6346c7
Merge pull request #2952 from nlohmann/fewer_appveyor_builds
...
Avoid duplicate AppVeyor builds
2021-08-18 20:04:25 +02:00
Niels Lohmann
f79bed6d39
👷 avoid duplicate AppVeyor builds
2021-08-18 19:53:35 +02:00
Arseniy Terekhin
355fa6c35c
🚨 gdb_pretty_printer failure on basic types
...
name can be None, and `re.search` fails on `None`;
replaced `re` by `str.startswith` and `str.endswith`
2021-08-18 19:29:50 +03:00
Amir Masoud Abdol
b65748f763
Using the homebrew/core Formula
...
I've submitted a PR on [homebrew/core](https://github.com/Homebrew/homebrew-core/pull/83479 ) that updates their Formula. After that one is set, we can merge this and let users use the default formula, and we don't have to maintain two separate Formulas.
2021-08-18 16:49:51 +02:00
Niels Lohmann
cfb71ad1bf
🐛 adding missing header
2021-08-18 13:33:35 +02:00
Niels Lohmann
54d9cd5a12
🔧 guard tests with JSON_Install flag
2021-08-18 13:24:12 +02:00
Niels Lohmann
5d3ad31d7e
🔥 remove outdated json_unit binary
2021-08-18 12:41:03 +02:00
Amir Masoud Abdol
8e4996c156
Updating the Homebrew Command
...
This resolves a conflict, and stops Homebrew from using the default formula.
2021-08-18 11:55:25 +02:00
Niels Lohmann
f42a74b8f5
Merge branch 'release/3.10.0' into develop
2021-08-17 20:40:42 +02:00
Niels Lohmann
1de378f580
🔖 set version to 3.10.0
2021-08-17 15:23:23 +02:00
Niels Lohmann
8cae9d7cd2
Overwork warning flags ( #2936 )
...
* ⚗️ update warning flags
2021-08-17 14:43:43 +02:00
Niels Lohmann
f1e63a8322
👷 run CI for release branches
2021-08-16 15:40:57 +02:00
Niels Lohmann
fa5d3b5a9b
👷 run CI for release branches
2021-08-15 22:49:31 +02:00
Niels Lohmann
09237272bc
👥 update documentation
2021-08-15 21:05:26 +02:00
Niels Lohmann
1300d2e4c3
Merge pull request #2908 from nlohmann/issue2863
...
Fix binary subtypes
2021-08-14 14:27:58 +02:00
Niels Lohmann
1aceeff3fc
🚨 fix C4244 warning
2021-08-14 13:40:52 +02:00
Niels Lohmann
0a0eb7a850
Merge branch 'develop' of https://github.com/nlohmann/json into issue2863
...
Conflicts:
.github/workflows/windows.yml
2021-08-14 11:19:48 +02:00
Niels Lohmann
6ac037c1f6
Merge pull request #2930 from nlohmann/msvc_warnings_as_error
2021-08-13 21:23:24 +02:00
Niels Lohmann
e5ef44c4dd
Merge pull request #2927 from fhuberts/fix-switch-enum
2021-08-13 19:32:39 +02:00
Niels Lohmann
4b0e04eb68
🚨 fix C4100 warnings
2021-08-13 17:03:55 +02:00
Ferry Huberts
cdbc50b9a8
Again forgot to amalgate (sigh)
...
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
2021-08-13 15:33:05 +02:00
Ferry Huberts
364a21be6b
Add coverage exclusion comments, as requested
...
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
2021-08-13 15:30:55 +02:00
Ferry Huberts
95b73bcd01
Forgot to amalgate
...
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
2021-08-13 14:22:18 +02:00
Niels Lohmann
288cdf9af7
⚗️ add -WX flag to MSVC builds
2021-08-13 14:07:17 +02:00
Ferry Huberts
e7a69b8d31
Adjust more files after actually building like the CI
...
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
2021-08-13 14:00:00 +02:00
Niels Lohmann
fecb01858b
⚗️ add -WX flag to MSVC builds
2021-08-13 13:28:17 +02:00
Niels Lohmann
789280fcb2
🚨 fix C4309 warning
2021-08-13 13:20:26 +02:00
Niels Lohmann
e65db83448
⚗️ add -WX flag to MSVC builds
2021-08-13 12:42:38 +02:00
