Niels Lohmann
|
fc2f7116fe
|
Merge pull request #2756 from nlohmann/issue2755
replace EOF with std::char_traits<char>::eof()
|
2021-05-04 12:56:46 +02:00 |
|
Niels Lohmann
|
b08139ea4b
|
♻️ replace EOF with std::char_traits<char>::eof()
|
2021-05-04 10:22:34 +02:00 |
|
Niels Lohmann
|
d4f446592f
|
Merge pull request #2754 from mortenfyhn/patch-1
Fix typo in README
|
2021-05-03 12:24:55 +02:00 |
|
Morten Fyhn Amundsen
|
193bf9d6b6
|
Fix typo in README
|
2021-05-03 09:46:00 +02:00 |
|
Niels Lohmann
|
b2e784c33b
|
Merge pull request #2749 from nlohmann/docs
|
2021-04-29 23:05:33 +02:00 |
|
Niels Lohmann
|
d0ab2b86c3
|
📝 update documentation
|
2021-04-29 17:19:57 +02:00 |
|
Niels Lohmann
|
8a29a6ecf4
|
Merge pull request #2731 from theShmoo/custom-cpp-version
Fixes #2730
|
2021-04-29 09:55:16 +02:00 |
|
Niels Lohmann
|
07344fdd09
|
Merge pull request #2747 from nlohmann/docs
Add documentation for numbers
|
2021-04-28 22:06:25 +02:00 |
|
Niels Lohmann
|
cdfe865486
|
📝 add documentation for numbers
|
2021-04-28 20:33:05 +02:00 |
|
David Pfahler
|
d140a1c777
|
fixed amalgamation file
|
2021-04-26 08:39:24 +02:00 |
|
David Pfahler
|
5a77314c5e
|
replaced define
JSON_VERSION_IS_PREDEFINED with JSON_HAS_CPP_11
|
2021-04-26 08:09:36 +02:00 |
|
Niels Lohmann
|
a34e011e24
|
Merge pull request #2576 from AnthonyVH/non_default_constructable_stl_containers
Add support for deserialization of STL containers of non-default constructable types (fixes #2574).
|
2021-04-25 15:22:37 +02:00 |
|
Niels Lohmann
|
f1600cd26b
|
Merge pull request #2737 from nlohmann/upgrade_ci
Use Clang 12 in CI
|
2021-04-25 15:20:42 +02:00 |
|
Niels Lohmann
|
f6e9654aaa
|
🔇 suppress unsigned integer warnings
|
2021-04-25 14:33:12 +02:00 |
|
Niels Lohmann
|
52717b7473
|
👷 add clang 11
|
2021-04-24 14:27:13 +02:00 |
|
Niels Lohmann
|
608fbffcb1
|
📝 update compiler versions
|
2021-04-24 13:51:53 +02:00 |
|
Niels Lohmann
|
0638a27ed3
|
👷 add step for Infer
|
2021-04-24 13:50:30 +02:00 |
|
Niels Lohmann
|
10fc5162e7
|
⬆️ use Clang 12 where available
|
2021-04-24 13:24:36 +02:00 |
|
Niels Lohmann
|
9774e53cd6
|
Merge pull request #2707 from raduteo/patch-2
Update json.hpp
|
2021-04-23 09:48:38 +02:00 |
|
David Pfahler
|
0a2de2f5b9
|
fixed amalgation file for #2728
|
2021-04-21 12:54:55 +02:00 |
|
David Pfahler
|
6b267e3cb1
|
fixed amalgation file for #2730
|
2021-04-21 12:53:58 +02:00 |
|
David Pfahler
|
38952643c5
|
generate amalgation to fix CI for #2730
|
2021-04-21 12:46:37 +02:00 |
|
David Pfahler
|
31c4c8f36c
|
Fixes #2730
Added define JSON_VERSION_IS_PREDEFINED
for skipping automatic JSON_HAS_CPP_* detection
|
2021-04-21 11:03:28 +02:00 |
|
David Pfahler
|
1a1381f071
|
Fixes #2728
includes some macros to be defined for using without file io.
|
2021-04-21 10:24:01 +02:00 |
|
raduteo
|
35d79203ec
|
Update json.hpp
|
2021-04-12 19:47:02 -04:00 |
|
raduteo
|
e8dbd7be86
|
Update json.hpp
Proposed fix for #2706
|
2021-04-09 09:35:58 -04:00 |
|
Niels Lohmann
|
7126d88803
|
Merge pull request #2690 from doronbehar/patch-1
pkg-config.pc.in: Don't concatenate paths
|
2021-03-30 07:50:28 +02:00 |
|
Doron Behar
|
53a9850eeb
|
pkg-config.pc.in: Don't concatenate paths
See: https://github.com/jtojnar/cmake-snips#assuming-cmake_install_dir-is-relative-path
|
2021-03-29 21:43:49 +00:00 |
|
Niels Lohmann
|
3f33c21725
|
Merge pull request #2689 from nlohmann/ci_matrix
add more CI steps
|
2021-03-29 09:25:04 +02:00 |
|
Niels Lohmann
|
d927f44576
|
💚 fix build
|
2021-03-28 15:30:37 +02:00 |
|
Niels Lohmann
|
077fe41a82
|
🚧 do not check pushes to non-default branches
|
2021-03-28 14:59:42 +02:00 |
|
Niels Lohmann
|
ae99a31bea
|
🚧 add more CI tests
|
2021-03-28 14:48:58 +02:00 |
|
Niels Lohmann
|
f268035946
|
👷 consolidate CI
|
2021-03-28 13:37:04 +02:00 |
|
Niels Lohmann
|
1f1fa9f30e
|
🔥 remove some Travis builds
|
2021-03-27 14:44:39 +01:00 |
|
Niels Lohmann
|
c591b6ca6c
|
👷 move some MSVC jobs from AppVeyor to GitHub Actions
|
2021-03-27 10:43:05 +01:00 |
|
Niels Lohmann
|
5213ae56ac
|
Merge pull request #2687 from musicinmybrain/nonconstant-sigstksz
Update doctest from 2.4.4 to 2.4.6 (fixes #2686)
|
2021-03-27 07:06:04 +01:00 |
|
Benjamin A. Beasley
|
ef826b6fba
|
Update doctest from 2.4.4 to 2.4.6 (fixes #2686)
|
2021-03-25 13:16:04 -04:00 |
|
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 |
|