Niels Lohmann
823801879a
Merge pull request #2683 from nlohmann/license_fix
...
License fix
2021-03-25 13:04:55 +01:00
Niels Lohmann
4a344e1ef0
Merge pull request #2375 from karzhenkov/fix-travis-release
...
Properly select "Release" build for Travis
2021-03-25 12:14:22 +01:00
Anthony VH
2b865131d8
Fixing CI errors.
2021-03-24 23:33:21 +01:00
Niels Lohmann
9d57351175
🐛 set correct value for JSON_ImplicitConversions in ci_test_noimplicitconversions
2021-03-24 20:27:12 +01:00
Alexander Karzhenkov
bf75a1b91d
Merge branch 'develop' into #2375
...
# Conflicts:
# .travis.yml
2021-03-24 20:33:35 +05:00
Anthony VH
8e79917d32
Fix clang-tidy complaints.
2021-03-24 13:27:59 +01:00
Niels Lohmann
41dbd50313
📄 use code from Google Abseil
2021-03-24 13:27:00 +01:00
Anthony VH
322bc99d8e
Reran amalgamate.
2021-03-24 13:03:36 +01:00
Niels Lohmann
ca9a1f2fd4
📝 add note to outdated exceptions
2021-03-24 12:46:34 +01:00
Anthony VH
333612ce35
Merge remote-tracking branch 'upstream/develop' into non_default_constructable_stl_containers
2021-03-24 12:33:57 +01:00
Niels Lohmann
6f551930e5
🚨 add new CI and fix warnings ( #2561 )
...
* ⚗️ move CI targets to CMake
* ♻️ add target for cpplint
* ♻️ add target for self-contained binaries
* ♻️ add targets for iwyu and infer
* 🔊 add version output
* ♻️ add target for oclint
* 🚨 fix warnings
* ♻️ rename targets
* ♻️ use iwyu properly
* 🚨 fix warnings
* ♻️ use iwyu properly
* ♻️ add target for benchmarks
* ♻️ add target for CMake flags
* 👷 use GitHub Actions
* ⚗️ try to install Clang 11
* ⚗️ try to install GCC 11
* ⚗️ try to install Clang 11
* ⚗️ try to install GCC 11
* ⚗️ add clang analyze target
* 🔥 remove Google Benchmark
* ⬆️ Google Benchmark 1.5.2
* 🔥 use fetchcontent
* 🐧 add target to download a Linux version of CMake
* 🔨 fix dependency
* 🚨 fix includes
* 🚨 fix comment
* 🔧 adjust flags for GCC 11.0.0 20210110 (experimental)
* 🐳 user Docker image to run CI
* 🔧 add target for Valgrind
* 👷 add target for Valgrind tests
* ⚗️ add Dart
* ⏪ remove Dart
* ⚗️ do not call ctest in test subdirectory
* ⚗️ download test data explicitly
* ⚗️ only execute Valgrind tests
* ⚗️ fix labels
* 🔥 remove unneeded jobs
* 🔨 cleanup
* 🐛 fix OCLint call
* ✅ add targets for offline and git-independent tests
* ✅ add targets for C++ language versions and reproducible tests
* 🔨 clean up
* 👷 add CI steps for cppcheck and cpplint
* 🚨 fix warnings from Clang-Tidy
* 👷 add CI steps for Clang-Tidy
* 🚨 fix warnings
* 🔧 select proper binary
* 🚨 fix warnings
* 🚨 suppress some unhelpful warnings
* 🚨 fix warnings
* 🎨 fix format
* 🚨 fix warnings
* 👷 add CI steps for Sanitizers
* 🚨 fix warnings
* ⚡ add optimization to sanitizer build
* 🚨 fix warnings
* 🚨 add missing header
* 🚨 fix warnings
* 👷 add CI step for coverage
* 👷 add CI steps for disabled exceptions and implicit conversions
* 🚨 fix warnings
* 👷 add CI steps for checking indentation
* 🐛 fix variable use
* 💚 fix build
* ➖ remove CircleCI
* 👷 add CI step for diagnostics
* 🚨 fix warning
* 🔥 clean Travis
2021-03-24 07:15:18 +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
176d8e261a
Merge pull request #2562 from nlohmann/diagnostics
...
Better diagnostics
2021-02-10 07:20:54 +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
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
6d4eed5aeb
🚨 fix warning
2021-01-30 12:51:54 +01:00
Niels Lohmann
27b44cb17b
Merge branch 'issue2615' of https://github.com/nlohmann/json into develop
2021-01-28 14:47:28 +01:00
Niels Lohmann
9f6b78ee5a
📝 add documentation
2021-01-27 14:34:10 +01:00
Niels Lohmann
5b0c804630
🐛 properly assign two labels to one test case #2596
2021-01-27 14:22:58 +01:00
Niels Lohmann
ffdeb77468
🚨 fix warnings #2615
2021-01-27 12:54:46 +01:00
Niels Lohmann
3b63a47270
🚨 suppress warning
2021-01-26 20:53:02 +01:00
Niels Lohmann
524eea5887
👌 remove unused template parameter
2021-01-26 17:49:15 +01:00
Niels Lohmann
74cc0ab470
♻️ remove diagnostics_t class
2021-01-25 13:47:50 +01:00
Anthony VH
130382f2a9
Remove comment about GCC commit which didn't really relate to the code.
2021-01-24 20:02:24 +01:00
Niels Lohmann
e8dba10f53
✅ add test
2021-01-24 17:45:48 +01:00
Niels Lohmann
c190a72f3d
👌 apply suggestion
...
Co-authored-by: Alexander Karzhenkov <karzhenkov@mail.ru>
2021-01-24 17:45:08 +01:00
Niels Lohmann
b83fe5dbf2
Merge pull request #2607 from nlohmann/issue1952
...
Add GDB pretty printer
2021-01-24 13:58:20 +01:00
Niels Lohmann
380a613f2b
🐛 fix bug in diagnostics_t
2021-01-23 20:58:59 +01:00
Anthony VH
848927ae90
Updated comments as requested.
2021-01-23 18:24:47 +01:00
Niels Lohmann
312a998873
🚸 add GDB pretty printer
2021-01-23 13:26:44 +01:00
Niels Lohmann
7b7da08fb6
📝 update documentation
2021-01-23 10:04:19 +01:00
Niels Lohmann
42218cac1b
⚗️ try 9 bytes
2021-01-21 22:01:09 +01:00
Niels Lohmann
d00ad33e46
📝 update documentation
2021-01-21 21:47:19 +01:00
Niels Lohmann
51ac6000d2
✅ improve coverage
2021-01-21 13:36:23 +01:00
Niels Lohmann
d6ff059a90
👌 addressed review comments
2021-01-20 15:05:07 +01:00
Niels Lohmann
33379684b4
✅ improve coverage
2021-01-17 22:52:40 +01:00
Niels Lohmann
5ec0980514
💚 fix build
2021-01-17 16:51:14 +01:00
Niels Lohmann
65107f7c9d
💚 fix build
2021-01-17 13:32:36 +01:00
Niels Lohmann
e23af7434d
🚨 fix warnings
2021-01-17 13:32:26 +01:00
Niels Lohmann
aeecc09ba1
✅ add tests for diagnostics
2021-01-16 15:33:19 +01:00
Niels Lohmann
e9d641130d
🐛 proper JSON Pointer escape in diagnostic messages
2021-01-16 15:33:05 +01:00
Niels Lohmann
29f7abf57d
🚨 fix format-truncation warning #2572
2021-01-15 17:01:47 +01:00
