wt/json
1
0 Fork 0
mirror of https://github.com/nlohmann/json.git synced 2026-11-09 16:21:35 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,178 Commits 19 Branches 57 Tags
7c19aa22108eef6ff01a16b7fa7b09ef9058b3b5
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Niels Lohmann 9ed027ac10 Merge pull request #2902 from nlohmann/issue2893 
Fix useless-cast warnings
 2021-07-31 20:42:55 +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
Niels Lohmann 8f0a880c89 Merge pull request #2879 from nlohmann/issue2598 
Avoid string in case of empty CBOR objects
 2021-07-17 12:38:33 +02:00
Niels Lohmann b2d21067d1 Merge pull request #2762 from jpl-mac/no.tidy.warnings.dev 
Add a cmake option to use SYSTEM in target_include_directories
 2021-07-16 12:06:26 +02: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 c89e23c69b Merge pull request #2874 from nlohmann/issue2572 
Fix truncation warning
 2021-07-16 07:54:48 +02:00
Niels Lohmann f883ddd1c2 Merge pull request #2872 from nlohmann/issue2865 
Fix memory leak in to_json
 2021-07-16 06:52:28 +02:00
Niels Lohmann c9c5c016a2 Merge pull request #2866 from nlohmann/issue2838 2021-07-14 12:04:37 +02:00
Niels Lohmann 4e92a61784 Merge pull request #2795 from turintech/develop 
Specified git branch for google benchmark fetch in benchmark test
 2021-07-13 16:58:25 +02:00
Niels Lohmann 9426074ce8 Merge pull request #2861 from nlohmann/documentation 
Update documentation
 2021-07-11 14:15:41 +02:00
Niels Lohmann 6471a63115 Merge pull request #2729 from theShmoo/without-io 
Possibility to use without the dependency to file io and streams to use in intel sgx enclaves
 2021-06-26 12:50:06 +02:00
Niels Lohmann 624f59eacb Merge pull request #2826 from justanotheranonymoususer/patch-1 
Consistency with `using` in README.md
 2021-06-21 14:48:39 +02:00
Niels Lohmann 18a5f4c7ca Merge pull request #2790 from nlohmann/macos_standards 
Add C++ standards to macOS matrix
 2021-06-14 20:23:21 +02:00
Niels Lohmann 71a514a651 Merge pull request #2770 from jasmcaus/patch-1 
Keep consistent formatting
 2021-06-14 07:18:46 +02:00
Niels Lohmann 95ad4ae071 Merge pull request #2817 from nlohmann/fix_ci 
Fix CI
 2021-06-14 07:16:32 +02:00
Niels Lohmann e10a3fac8a Merge pull request #2789 from TotalCaesar659/patch-2 
Update URLs to HTTPS
 2021-05-28 10:31:04 +02:00
Niels Lohmann 0972f7ff0e Merge pull request #2771 from offa/conan_package_url 
Link to Conan Center package added
 2021-05-15 19:26:34 +02:00
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 d4f446592f Merge pull request #2754 from mortenfyhn/patch-1 
Fix typo in README
 2021-05-03 12:24:55 +02:00
Niels Lohmann b2e784c33b Merge pull request #2749 from nlohmann/docs 2021-04-29 23:05:33 +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 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 9774e53cd6 Merge pull request #2707 from raduteo/patch-2 
Update json.hpp
 2021-04-23 09:48:38 +02: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
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 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
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
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
Niels Lohmann 176d8e261a Merge pull request #2562 from nlohmann/diagnostics 
Better diagnostics
 2021-02-10 07:20:54 +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
Niels LohmannandAlexander Karzhenkov 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 92fa1d9582 Merge pull request #2582 from bl-ue/patch-1 
readme: fix tilde character display
 2021-01-14 22:11:33 +01:00
Niels Lohmann 68c3696382 Merge pull request #2560 from nlohmann/issue2324 
Add switch to skip non-reproducible tests.
 2020-12-31 14:35:45 +01:00
Niels Lohmann a8398a7151 Merge pull request #2550 from nlohmann/std_bytes 
Allow parsing from std::byte containers
 2020-12-30 08:33:52 +01:00
Niels Lohmann ff3863dc1d Merge pull request #2553 from jasujm/jasujm/input_adapter_custom_container 
Fix compilation of input_adapter(container) in edge cases
 2020-12-29 14:37:20 +01:00
Niels Lohmann f78d456075 Merge pull request #2540 from karzhenkov/disrupt-cxx17-tests 
Travis doesn't run any tests in C++17 mode
 2020-12-21 20:58:06 +01:00
Niels Lohmann c3c574cf96 Merge pull request #2538 from YarikTH/feature/doctest_v2.4.3 
Doctest is updated to v2.4.3
 2020-12-18 22:10:42 +01:00
Niels Lohmann 8593260044 Merge pull request #2537 from nlohmann/fix_warnings 
Fix warnings
 2020-12-17 21:48:16 +01:00
Niels Lohmann af8c6e7aa9 Merge pull request #2533 from nlohmann/c++_future 
Do not unconditionally redefine C++14 constructs
 2020-12-16 20:54:09 +01:00
Niels Lohmann 5c1a5bc9c1 Merge pull request #2534 from nlohmann/clarify_license 
Clarify license of is_complete_type implementation
 2020-12-16 20:53:38 +01:00
Niels Lohmann 45810082d4 Merge pull request #2536 from nlohmann/shadowing 
Fix a shadowing warning
 2020-12-16 20:52:46 +01:00
Niels Lohmann 2fc1f694ad Merge pull request #2514 from globberwops/develop 
Add MAIN_PROJECT check for test and install options
 2020-12-14 13:41:46 +01:00
Niels Lohmann be32cc4f5e Merge pull request #2525 from YarikTH/feature/doctest_v2.4.1 
Doctest is updated to v2.4.1
 2020-12-12 15:08:55 +01:00
Niels Lohmann 260be043ba Merge pull request #2406 from leozz37/develop 
📝  add CPM.Cmake example
 2020-12-11 14:47:18 +01:00
Niels Lohmann 5026acd70c Merge pull request #2444 from linev/fix_gcc48_warn 
Change argument name "subtype" in byte_container_with_subtype
 2020-12-11 13:46:41 +01:00
Niels Lohmann 3ad6992f50 Merge pull request #2405 from karzhenkov/fix-json_ref-move 
Fix move constructor of json_ref
 2020-12-11 13:36:33 +01:00
Niels Lohmann e3643aadf7 Merge pull request #2447 from jbzdarkid/develop 
Add asserts to suppress C28020
 2020-12-11 13:27:52 +01:00
Niels Lohmann d9e2b191ad Merge pull request #2512 from YarikTH/issue2490 
Ranged insert test section is added in unit-ordered_json.cpp
 2020-12-11 13:21:33 +01:00
Niels Lohmann 6030a11051 Merge pull request #2367 from nlohmann/hedley14 
Update Hedley
 2020-08-26 08:13:43 +02:00
Niels Lohmann b9d76516a2 Merge pull request #2363 from nlohmann/issue2360 
Fix and extend documentation of discarded values
 2020-08-20 11:38:43 +02:00
Niels Lohmann 772f37c12d Merge pull request #2354 from rbuch/develop 
Fix typos in documentation
 2020-08-14 06:04:56 +02:00
Niels Lohmann 8d0aa09ab5 Merge pull request #2352 from nlohmann/private_macro 
Remove "#define private public" from tests
 2020-08-13 10:06:59 +02:00
Niels Lohmann b888afe5f4 Merge pull request #2349 from nlohmann/issue2348 
Remove -Wimplicit-fallthrough warning
 2020-08-11 09:05:02 +02:00
Niels Lohmann 37ce871eeb Merge pull request #2347 from nlohmann/no_exceptions 
Fix code to work without exceptions
 2020-08-10 22:47:27 +02:00
Niels Lohmann e030d26089 Merge pull request #2344 from ongjunjie/fix-cmake-overwrite-compiler 
fix cmake script overwriting compiler path
 2020-08-08 12:15:10 +02:00
Niels Lohmann f4155e4727 Merge pull request #2333 from nlohmann/fallthrough 
Fix fallthrough warning
 2020-08-01 15:32:21 +02:00
Niels Lohmann 8a54617240 Merge pull request #2332 from nlohmann/issue2330 
Fix lexer to properly cope with repeated comments
 2020-08-01 12:29:33 +02:00
Niels Lohmann 1da931730a Merge pull request #2327 from nlohmann/issue2326 
Fix name of Homebrew formula in documentation
 2020-07-31 08:00:08 +02:00
Niels Lohmann 1eedee5e4e Merge pull request #2319 from nlohmann/issue2315 
Fix a bug due to missing overloads in ordered_map container
 2020-07-31 07:59:18 +02:00
Niels Lohmann 35daa5c00b Merge pull request #2320 from wx257osn2/fix-typo 
fix typo
 2020-07-30 12:27:16 +02:00
Niels Lohmann 1b8efed06f Merge pull request #2318 from eli-schwartz/installfix 
cmake: install pkg-config file relative to current_binary_dir
 2020-07-28 13:25:04 +02:00
Niels Lohmann 7d01a9e875 Merge branch 'develop' into installfix 2020-07-28 13:24:54 +02:00
Niels Lohmann b3da8b325a Merge pull request #2314 from xvitaly/fix-path 
Fixed installation of pkg-config file on other than Ubuntu
 2020-07-28 13:24:08 +02:00
Niels Lohmann 67ed63b196 Merge pull request #2312 from nlohmann/docs 
Update documentation
 2020-07-26 10:06:01 +02:00
Niels Lohmann 808aca41aa Merge pull request #2305 from AODQ/develop 
fixes unused variable 'ex' for #2304
 2020-07-25 21:51:54 +02:00
Niels Lohmann 63e7c40e35 Merge pull request #2297 from nlohmann/issue2286 
Add support for high-precision numbers in UBJSON encoding
 2020-07-25 21:50:53 +02:00
Niels Lohmann 40b78d3847 Merge pull request #2308 from nlohmann/cbor_tags 
Fix bug in CBOR tag handling
 2020-07-25 19:43:11 +02:00
Niels Lohmann a1dbfcd736 Merge pull request #2306 from jwittbrodt/develop 
added inline to NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE macro
 2020-07-25 10:52:56 +02:00
Niels Lohmann c00c3162b2 Merge branch 'develop' into develop 2020-07-25 10:52:42 +02:00
Niels Lohmann 448ceb2e12 Merge pull request #2303 from nlohmann/cleanup 
Cleanup
 2020-07-25 05:41:51 +02:00
Niels Lohmann 43e07bb92d Merge pull request #2301 from nlohmann/regression2281 
Add test with multiple translation units
 2020-07-23 13:14:24 +02:00
Niels Lohmann a048b72fe1 Merge pull request #1559 from theodelrieu/feat/explicit_conversion_operator 
Feat/explicit conversion operator
 2020-07-23 08:52:51 +02:00
Niels Lohmann 484029b51c Merge pull request #2299 from nlohmann/fix_warnings 
Fix unused parameter
 2020-07-22 18:43:33 +02:00
Niels Lohmann 2cd10a7405 Merge pull request #2300 from nlohmann/gihub_actions 
Merge Gitlab actions
 2020-07-22 09:45:55 +02:00
Niels Lohmann 8344857764 Merge pull request #2287 from pfeatherstone/develop 
Serialisation macros: increase upper bound on number of member variables
 2020-07-20 21:35:55 +02:00
Niels Lohmann 893eda8353 Merge pull request #2294 from jprochazk/develop 
fix eof for get_binary and get_string
 2020-07-20 08:02:03 +02:00
Niels Lohmann b1da58b76b Merge pull request #2282 from nlohmann/missing_sax_check 
Add static assertion for missing binary function in SAX interface
 2020-07-19 18:09:08 +02:00
Niels Lohmann 1fd6c5882a Merge pull request #2285 from T0b1-iOS/develop 
add inline specifier for detail::combine
 2020-07-19 17:55:51 +02:00
Niels Lohmann 43ab8a2357 Merge pull request #2279 from nlohmann/issue1818 
Add test for target_include_directories
 2020-07-18 06:12:57 +02:00
Niels Lohmann a10d486e36 Merge pull request #2244 from matthewbauer/tag-cbor 
Tag binary values in cbor if set
 2020-07-17 14:05:48 +02:00
Niels Lohmann e65cc9dccb Merge pull request #2274 from nlohmann/analyzers 
Clean up maintainer Makefiles and fix some linter warnings
 2020-07-17 14:01:19 +02:00
Niels Lohmann 548e7e54c9 Merge pull request #2273 from nlohmann/issue1968 
Add option to ignore CBOR tags
 2020-07-17 13:59:55 +02:00
Niels Lohmann 6023a7ccd9 Merge branch 'develop' into analyzers 2020-07-17 13:59:32 +02:00
Niels Lohmann 270f1ae482 Merge pull request #2269 from nlohmann/hash 
Hash function without allocation
 2020-07-17 13:57:47 +02:00
Niels Lohmann 23c97f4aa5 Merge pull request #2268 from t-b/feature/add-clang-cl 
Add ClangCL for MSVC
 2020-07-16 07:40:58 +02:00
Niels Lohmann 1a521cbd36 Merge pull request #2264 from t-b/feature/use-proper-SED-in-makefile 
Makefile: Always use SED variable
 2020-07-14 14:07:33 +02:00
Niels Lohmann 8921e5e5db Merge pull request #2262 from nlohmann/more_ci 
Add Xcode 12 CI
 2020-07-13 21:04:57 +02:00
Niels Lohmann e316f5c5b6 Merge pull request #2258 from nlohmann/issue2179 
Add ordered_json specialization with ordered object keys
 2020-07-12 13:11:23 +02:00
Niels Lohmann 486812904f Merge pull request #2259 from nlohmann/clang_windows 
Make library work with Clang on Windows
 2020-07-12 13:09:35 +02:00
Niels Lohmann 5f146cb853 Merge pull request #2206 from gatopeich/issue2179 
Simple ordered_json that works on all supported compilers
 2020-07-11 13:15:40 +02:00
Niels Lohmann 75d5d05993 Merge pull request #2253 from ericonr/pkgconf 
Add pkg-config file
 2020-07-09 20:42:42 +02:00