mirror/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2024-12-17 23:57:52 +08:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity
4,246 Commits 13 Branches 56 Tags 271 MiB
23e3b622aa
Commit Graph

4246 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Ferry Huberts
832cee5b77 Adjust warnings flags, as requested 
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
 2021-08-12 19:49:54 +02:00
Ferry Huberts
44d60f8d14 All: fix warnings when compiling with -Wswitch-enum 
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
 2021-08-12 16:33:50 +02:00
Niels Lohmann
910fabf8f0
Merge pull request #2925 from nlohmann/issue2924 
Guard GCC pragmas
 2021-08-12 07:58:50 +02:00
Niels Lohmann
e20f3f95eb
🚨 guard GCC pragmas #2924 2021-08-11 23:55:46 +02:00
Niels Lohmann
57d31d1b83
Merge pull request #2898 from nlohmann/issue2824 
Add regression test
 2021-08-11 13:02:49 +02:00
Niels Lohmann
8ae31a56a5
Merge branch 'develop' of https://github.com/nlohmann/json into issue2824 2021-08-11 08:06:32 +02:00
Niels Lohmann
68d8661f1b
📝 update documentation 2021-08-11 08:06:25 +02:00
Niels Lohmann
b792bf5660
⚗️ try minimal example 2021-08-10 10:29:13 +02:00
Niels Lohmann
26569f8ecc
⚗️ try minimal example 2021-08-10 10:09:31 +02:00
Niels Lohmann
edc203a837
⚗️ try minimal example 2021-08-10 08:35:14 +02:00
Niels Lohmann
0d530c9de8
⚗️ try minimal example 2021-08-10 08:22:21 +02:00
Niels Lohmann
36394cc262
⚗️ try minimal example 2021-08-09 21:58:05 +02:00
Niels Lohmann
83c005f881
⚗️ try minimal example 2021-08-09 21:43:03 +02:00
Niels Lohmann
523f7c2c9d
💡 update documentation 2021-08-08 13:24:17 +02:00
Niels Lohmann
db7ccafbda
💚 fix MSVC build 2021-08-07 13:55:25 +02:00
Niels Lohmann
a4c3cf7798
💚 fix MSVC build 2021-08-07 13:40:01 +02:00
Niels Lohmann
346c9c1a19
💚 fix MSVC build 2021-08-07 13:37:17 +02:00
Niels Lohmann
c5928501b0
💚 fix MSVC build 2021-08-07 13:19:25 +02:00
Niels Lohmann
176e9bf0ab
✅ add tests for CBOR 2021-08-07 13:14:08 +02:00