Niels Lohmann
3d0812a382
🔥 clean Travis
2021-03-23 18:20:56 +01:00
Niels Lohmann
f7ada0a8e1
🚨 fix warning
2021-03-23 18:15:52 +01:00
Niels Lohmann
63c52b1201
🚨 fix warning
2021-03-23 13:56:46 +01:00
Niels Lohmann
bc23505c54
🚨 fix warning
2021-03-23 13:39:31 +01:00
Niels Lohmann
4428121ec7
🚨 fix warning
2021-03-23 13:31:35 +01:00
Niels Lohmann
5306eef150
🚨 fix warning
2021-03-23 13:15:06 +01:00
Niels Lohmann
fc38454a22
🚨 fix warning
2021-03-23 13:10:13 +01:00
Niels Lohmann
1e08af816d
🚨 fix warning
2021-03-23 12:31:03 +01:00
Niels Lohmann
3d1048ea78
Merge branch 'develop' of https://github.com/nlohmann/json into ci
2021-03-23 12:00:42 +01:00
Niels Lohmann
6b74772fe8
Merge pull request #2673 from remyjette/remove-exception-annotation
...
Remove HEDLEY annotation from exception::what()
2021-03-23 07:48:00 +01:00
Niels Lohmann
80e7d6fd9f
Merge pull request #2679 from frasermarlow/patch-1
...
Update parse_exceptions.md - correct `json::exception::parse_error`
2021-03-23 07:44:32 +01:00
Niels Lohmann
098dd6bf34
Merge pull request #2659 from abbaswasim/patch-1
...
Fix amount of entries in the json object
2021-03-23 07:22:44 +01:00
Fraser
90d51b9205
Update parse_exceptions.md
...
Referring to https://github.com/nlohmann/json/blob/develop/doc/examples/parse_error.cpp and https://json.nlohmann.me/home/exceptions/
(and also based on testing), the catch command should reference `catch (json::parse_error& ex)` and not `catch (json::exception::parse_error& ex)`
2021-03-18 12:25:12 -04:00
Remy Jette
0a9ec38f44
Remove HEDLEY annotation from exception::what()
...
The latest MSVC compiler throws the following warning on
nlohmann::detail::exception::what() if /analyze is enabled:
```
vcruntime_exception.h(93) : warning C28204: 'what' has an override at
`nlohmann\json\develop\single_include\nlohmann\json.hpp(2644)`
and only the override is annotated for return: when an override is
annotated, the base (this function) should be similarly annotated.
```
See https://godbolt.org/z/r331h4
2021-03-15 17:45:40 -07:00
abbaswasim
ddbdb65834
Fix amount of entries in the json object
...
After the initial j.push_back() calls there is another j.emplace_back() call that makes the size == 4 not 3.
2021-03-02 01:42:33 +00:00
Niels Lohmann
9882e4ac7d
👷 add CI step for diagnostics
2021-02-10 08:40:19 +01:00
Niels Lohmann
378622c5c6
➖ remove CircleCI
2021-02-10 08:30:49 +01:00
Niels Lohmann
bea760cc7e
💚 fix build
2021-02-10 08:30:09 +01:00
Niels Lohmann
2b0d696f4a
🔀 merge develop
2021-02-10 07:28:18 +01:00
Niels Lohmann
176d8e261a
Merge pull request #2562 from nlohmann/diagnostics
...
Better diagnostics
2021-02-10 07:20:54 +01:00
Niels Lohmann
efc1116beb
🐛 fix variable use
2021-02-09 09:56:25 +01:00
Niels Lohmann
d68b7f735f
👷 add CI steps for checking indentation
2021-02-09 09:51:14 +01:00
Niels Lohmann
29b27e3ee1
🚨 fix warnings
2021-02-08 21:04:02 +01:00
Niels Lohmann
fd37fc5171
Merge branch 'develop' of https://github.com/nlohmann/json into ci
2021-02-08 21:00:45 +01:00
Niels Lohmann
c9e66df00c
👷 add CI steps for disabled exceptions and implicit conversions
2021-02-08 21:00:37 +01:00
Niels Lohmann
bb90e34d22
⬆️ Hedley v15
2021-02-07 17:47:08 +01:00
Niels Lohmann
56a6dec0de
🔀 merge develop branch
2021-02-07 17:46:11 +01:00
Niels Lohmann
4917e7c259
Merge branch 'develop' of https://github.com/nlohmann/json into diagnostics
...
Conflicts:
include/nlohmann/detail/input/parser.hpp
single_include/nlohmann/json.hpp
2021-02-07 17:45:09 +01:00
Niels Lohmann
8d993523cf
Merge branch 'develop' of https://github.com/nlohmann/json into ci
...
Conflicts:
README.md
2021-02-07 14:30:09 +01:00
Niels Lohmann
e754ef7087
Merge pull request #2625 from wawiesel/patch-1
...
Fix missing 1.78 in example in README.md
2021-02-07 14:26:38 +01:00
William A. Wieselquist
567e2e3412
Fix missing 1.78 in example in README.md
2021-02-06 14:48:12 -05:00
Niels Lohmann
799472a308
👷 add CI step for coverage
2021-01-31 22:08:25 +01:00
Niels Lohmann
5573533181
👷 add CI step for coverage
2021-01-31 19:38:03 +01:00
Niels Lohmann
d6f54a0837
👷 add CI step for coverage
2021-01-31 18:37:47 +01:00
Niels Lohmann
91475eeff1
👷 add CI step for coverage
2021-01-31 17:57:27 +01:00
Niels Lohmann
829f119632
👷 add CI step for coverage
2021-01-31 17:06:06 +01:00
Niels Lohmann
053ed6c123
👷 add CI step for coverage
2021-01-31 16:22:44 +01:00
Niels Lohmann
21a193c69b
👷 add CI step for coverage
2021-01-31 15:50:25 +01:00
Niels Lohmann
9ced2bf5c3
👷 add CI step for coverage
2021-01-31 15:31:15 +01:00
Niels Lohmann
6738fbda94
👷 add CI step for coverage
2021-01-31 13:49:27 +01:00
Niels Lohmann
0f43ba9423
👷 add CI step for coverage
2021-01-31 13:21:05 +01:00
Niels Lohmann
143cc06a77
👷 add CI step for coverage
2021-01-31 13:06:20 +01:00
Niels Lohmann
6413f31d8e
👷 add CI step for coverage
2021-01-31 12:41:16 +01:00
Niels Lohmann
9b1d4691af
👷 add CI step for coverage
2021-01-30 14:09:04 +01:00
Niels Lohmann
4ba60702f4
🚨 fix warnings
2021-01-30 13:21:59 +01:00
Niels Lohmann
6d4eed5aeb
🚨 fix warning
2021-01-30 12:51:54 +01:00
Niels Lohmann
b66ebcc950
🚨 fix warnings
2021-01-30 12:50:36 +01:00
Niels Lohmann
7b3ba241ab
🚨 fix warnings
2021-01-29 23:00:44 +01:00
Niels Lohmann
2465302310
🚨 fix warnings
2021-01-29 23:00:30 +01:00
Niels Lohmann
0b7af878e4
🚨 fix warnings
2021-01-29 22:57:52 +01:00
