Commit graph

1435 commits

Author SHA1 Message Date
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 4b0e04eb68
🚨 fix C4100 warnings 2021-08-13 17:03:55 +02:00
Niels Lohmann 288cdf9af7
⚗️ add -WX flag to MSVC builds 2021-08-13 14:07:17 +02:00
Niels Lohmann 789280fcb2
🚨 fix C4309 warning 2021-08-13 13:20:26 +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 346c9c1a19
💚 fix MSVC build 2021-08-07 13:37:17 +02:00
Niels Lohmann 176e9bf0ab
add tests for CBOR 2021-08-07 13:14:08 +02:00
Niels Lohmann 89c98dfc20
add option to process binary subtypes in CBOR 2021-08-06 16:41:01 +02:00
Niels Lohmann 51a9880022
add tests for CBOR 2021-08-06 15:31:11 +02:00
Niels Lohmann 5c38e76c11
Merge branch 'develop' of https://github.com/nlohmann/json into issue2863 2021-08-06 13:23:26 +02:00
Sven Fink 3f5545f99b Remove -Wfloat-equal suppressions on tests 2021-08-04 09:14:45 +02:00
Niels Lohmann 7c19aa2210
♻️ overwork byte_container_with_subtype 2021-08-01 22:00:57 +02:00
Niels Lohmann 5a1bc76f34
⚗️ switch off exceptions 2021-08-01 13:34:55 +02:00
Niels Lohmann e7260f07f5
Merge branch 'develop' of https://github.com/nlohmann/json into issue2824 2021-08-01 13:07:43 +02:00
Niels Lohmann 8676f6745e
add regression test #2824 2021-07-30 21:18:25 +02:00
Niels Lohmann f4716a0d42
🚨 fix useless-cast warnings 2021-07-30 21:12:55 +02:00
Niels Lohmann c7822840eb
add regression test #2824 2021-07-30 15:00:54 +02:00
Niels Lohmann 2c030bac2c
add regression test #2824 2021-07-30 14:41:06 +02:00
Niels Lohmann 1c030cccf1
add regression test #2824 2021-07-29 15:23:21 +02:00
Niels Lohmann a563338039
Merge pull request #2825 from ldionne/ldionne-lazy
Properly constrain the basic_json conversion operator
2021-07-22 12:24:56 +02:00
Niels Lohmann 19a5e12136
CMake cleanup (#2885)
* 🔥 clean CMake files and Makefile
* 💡 update documentation
2021-07-22 09:25:55 +02:00
Niels Lohmann eba82ecd62
Refactor Unicode tests (#2889)
* ♻️ split Unicode tests
2021-07-21 21:17:01 +02:00
Louis Dionne b0e5965d71 Properly constrain the basic_json conversion operator
Fixes #2491
2021-07-19 11:16:27 -04:00
Niels Lohmann f907f9502d
Merge pull request #2875 from nlohmann/issue2592
Suppress C4127 warning in unit-json_pointer.cpp
2021-07-16 10:11:29 +02:00
Niels Lohmann 92ec35735c
Merge branch 'develop' of https://github.com/nlohmann/json into issue2592 2021-07-15 22:28:03 +02:00
Niels Lohmann db98073930
add regression test 2021-07-15 09:02:24 +02:00
Niels Lohmann b0730f29cf
🐛 fix logics 2021-07-12 15:24:06 +02:00
Niels Lohmann d40e98ecef
🐛 fix assertion failure #2838 2021-07-12 13:38:28 +02:00
Niels Lohmann cdfe865486
📝 add documentation for numbers 2021-04-28 20:33:05 +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 1f1fa9f30e
🔥 remove some Travis builds 2021-03-27 14:44:39 +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
Anthony VH 2b865131d8 Fixing CI errors. 2021-03-24 23:33:21 +01:00
Anthony VH 8e79917d32 Fix clang-tidy complaints. 2021-03-24 13:27:59 +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 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 5b0c804630
🐛 properly assign two labels to one test case #2596 2021-01-27 14:22:58 +01:00
Niels Lohmann 3b63a47270
🚨 suppress warning 2021-01-26 20:53:02 +01:00
Niels Lohmann 74cc0ab470
♻️ remove diagnostics_t class 2021-01-25 13:47:50 +01:00
Niels Lohmann e8dba10f53
add test 2021-01-24 17:45:48 +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