Niels Lohmann
dfdbbc71bb
Merge branch 'develop' of https://github.com/nlohmann/json into bon8
...
Conflicts:
docs/mkdocs/docs/api/basic_json/index.md
docs/mkdocs/docs/features/binary_formats/index.md
docs/mkdocs/mkdocs.yml
tests/src/unit-binary_formats.cpp
2022-06-18 21:19:48 +02:00
Richard Hozák
f6acdbec2c
Allow disabling default enum conversions ( #3536 )
2022-06-16 19:34:32 +02:00
Niels Lohmann
b6d00d1897
Small documentation fixes ( #3520 )
2022-06-06 16:46:55 +02:00
Florian Albrechtskirchinger
6b97599a27
Fix C++20/gcc-12 issues (Part 2) ( #3446 )
...
* Add C++20 3-way comparison operator and fix broken comparisons
Fixes #3207 .
Fixes #3409 .
* Fix iterators to meet (more) std::ranges requirements
Fixes #3130 .
Related discussion: #3408
* Add note about CMake standard version selection to unit tests
Document how CMake chooses which C++ standard version to use when
building tests.
* Update documentation
* CI: add legacy discarded value comparison
* Fix internal linkage errors when building a module
2022-05-29 13:08:06 +02:00
Niels Lohmann
6a7392058e
Complete documentation for 3.11.0 ( #3464 )
...
* 👥 update contributor and sponsor list
* 🚧 document BJData format
* 🚧 document BJData format
* 📝 clarified documentation of [json.exception.parse_error.112]
* ✏️ adjust titles
* 📝 add more examples
* 🚨 adjust warnings for index.md files
* 📝 add more examples
* 🔥 remove example for deprecated code
* 📝 add missing enum entry
* 📝 overwork table for binary formats
* ✅ add test to create table for binary formats
* 📝 fix wording in example
* 📝 add more examples
* Update iterators.md (#3481 )
* ✨ add check for overloads to linter #3455
* 👥 update contributor list
* 📝 add more examples
* 📝 fix documentation
* 📝 add more examples
* 🎨 fix indentation
* 🔥 remove example for destructor
* 📝 overwork documentation
* Updated BJData documentation, #3464 (#3493 )
* update bjdata.md for #3464
* Minor edit
* Fix URL typo
* Add info on demoting ND array to a 1-D optimized array when singleton dimension
Co-authored-by: Chaoqi Zhang <prncoprs@163.com>
Co-authored-by: Qianqian Fang <fangqq@gmail.com>
2022-05-17 13:08:56 +02:00
Niels Lohmann
88fbbd3aa8
Merge branch 'develop' of https://github.com/nlohmann/json into bon8
...
Conflicts:
docs/examples/to_bon8.cpp
docs/examples/to_bon8.output
docs/mkdocs/docs/api/basic_json/to_bon8.md
include/nlohmann/detail/input/binary_reader.hpp
include/nlohmann/detail/input/input_adapters.hpp
include/nlohmann/detail/output/binary_writer.hpp
single_include/nlohmann/json.hpp
test/CMakeLists.txt
tests/src/unit-binary_formats.cpp
tests/src/unit-bon8.cpp
2022-05-01 18:46:44 +02:00
Niels Lohmann
b21c345179
Reorganize directories ( #3462 )
...
* 🚚 move files
* 🚚 rename doc folder to docs
* 🚚 rename test folder to tests
2022-05-01 09:41:50 +02:00
