5e9bf559b1
# Conflicts:
...
# .github/workflows/macos.yml
# include/nlohmann/detail/input/parser.hpp
# include/nlohmann/detail/meta/std_fs.hpp
# include/nlohmann/json.hpp
# single_include/nlohmann/json.hpp
2024-11-16 23:23:05 +01:00
9561a122a3
🚨 fix warning
2024-11-08 23:47:11 +01:00
ad552c41be
🚨 fix warning
2024-11-08 23:41:46 +01:00
c35d260c2f
Suppress Clang-Tidy warnings ( #4276 )
2024-01-28 14:04:07 +01:00
9cca280a4d
JSON for Modern C++ 3.11.3 ( #4222 )
2023-11-28 22:36:31 +01:00
f56c6e2e30
Update documentation for the next release ( #4216 )
2023-11-26 15:51:19 +01:00
836b7beca4
Fix CI, again ( #4083 )
2023-09-07 20:41:12 +02:00
bbe337c3a3
Prevent memory leak when exception is thrown in adl_serializer::to_json ( #3901 )
...
Co-authored-by: barcode <barcode@example.com >
2023-03-08 13:43:45 +01:00
9d69186291
🔖 set version to 3.11.2
2022-08-12 15:04:06 +02:00
f2020da0dd
🔖 set version to 3.11.1
2022-08-01 23:27:58 +02:00
ce0e13ccea
🔖 set version to 3.11.0
2022-07-31 23:19:06 +02:00
d909f80960
Add versioned, ABI-tagged inline namespace and namespace macros ( #3590 )
...
* Add versioned inline namespace
Add a versioned inline namespace to prevent ABI issues when linking code
using multiple library versions.
* Add namespace macros
* Encode ABI information in inline namespace
Add _diag suffix to inline namespace if JSON_DIAGNOSTICS is enabled, and
_ldvcmp suffix if JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON is enabled.
* Move ABI-affecting macros into abi_macros.hpp
* Move std_fs namespace definition into std_fs.hpp
* Remove std_fs namespace from unit test
* Format more files in tests directory
* Add unit tests
* Update documentation
* Fix GDB pretty printer
* fixup! Add namespace macros
* Derive ABI prefix from NLOHMANN_JSON_VERSION_*
2022-07-30 21:59:13 +02:00
527da54dcb
Use REUSE framework ( #3546 )
...
* 📄 add licenses
* 👷 add REUSE compliance check
* 📝 add badge for REUSE
Co-authored-by: Florian Albrechtskirchinger <falbrechtskirchinger@gmail.com >
2022-07-20 12:38:07 +02:00
6ff2ea3aed
🥅 add assertion for invariant in SAX-DOM parser ( #3498 )
2022-05-19 19:56:33 +02:00
616caea27a
Re-template json_pointer on string type ( #3415 )
...
* Make exception context optional
Change exception context parameter to pointer and replace context with
nullptr where appropriate.
* Support escaping other string types
* Add string concatenation function
Add variadic concat() function for concatenating char *, char, and
string types.
* Replace string concatenations using + with concat()
* Template json_pointer on string type
Change json_pointer from being templated on basic_json to being
templated on string type.
* Add unit test for #3388
Closes #3388 .
* Fix regression test for #2958
* Add backwards compatibility with json_pointer<basic_json>
* Update json_pointer docs
* Allow comparing different json_pointers
* Update version numbers
2022-04-12 14:18:16 +02:00
29cd970b94
Consolidate documentation ( #3071 )
...
* 🔥 consolidate documentation
* ♻️ overwork std specializations
* 🚚 move images files to mkdocs
* ♻️ fix URLs
* 🔧 tweak MkDocs configuration
* 🔧 add namespaces
* 📝 document deprecations
* 📝 document documentation generation
* 🚸 improve search
* 🚸 add examples
* 🚧 start adding documentation for macros
* 📝 add note for https://github.com/nlohmann/json/issues/874#issuecomment-1001699139
* 📝 overwork example handling
* 📝 fix Markdown tables
2021-12-29 13:41:01 +01:00
6d3115924c
Add C++17 copies of the test binaries ( #3101 )
...
* ⚗️ add C++17 copies of the test binaries
* ⚗️ use proper header for filesystem
* 🚨 fix warnings
* ⚗️ do not use too old compilers with C++17
* ✅ add test
* 🔨 add more constraints #3097
* ⚗️ use fix from https://github.com/nlohmann/json/pull/3101#issuecomment-998788786
* ⚗️ use fix from https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90050
* 👷 use published CI image
2021-12-29 09:47:05 +01:00
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
74cc0ab470
♻️ remove diagnostics_t class
2021-01-25 13:47:50 +01:00
b9d3aa4067
♻️ split set_parent function
2021-01-14 21:55:49 +01:00
ff57bdcc8b
🐛 fix invariants
2021-01-10 22:40:50 +01:00
e160749003
♻️ move diagnostic code in header
2021-01-09 19:21:18 +01:00
ec0b1798bc
🚧 implement more parent relations
2021-01-02 21:36:11 +01:00
7b047861b0
🚧 add diagnostics to exceptions
2021-01-02 13:44:41 +01:00
15ec0fe150
change c-style cast to static_cast for #2304
2020-07-24 16:21:30 -04:00
12885446d8
fixes unused variable 'ex' for #2304
2020-07-23 13:21:38 -04:00
d047b3d495
🚨 remove linter warning
2020-07-16 14:45:39 +02:00
dc06f100be
Merge branch 'develop' of https://github.com/nlohmann/json into clang_windows
...
Conflicts:
include/nlohmann/detail/input/binary_reader.hpp
include/nlohmann/detail/input/json_sax.hpp
include/nlohmann/detail/input/lexer.hpp
include/nlohmann/detail/input/parser.hpp
include/nlohmann/detail/json_pointer.hpp
include/nlohmann/detail/output/serializer.hpp
include/nlohmann/json.hpp
single_include/nlohmann/json.hpp
2020-07-11 14:04:40 +02:00
98b1c6d302
🚩 use JSON_ASSERT(x) instead of assert(x)
2020-07-06 12:22:31 +02:00
ac3922c7aa
Merge branch 'develop' of https://github.com/nlohmann/json into clang_windows
...
Conflicts:
include/nlohmann/detail/input/binary_reader.hpp
include/nlohmann/detail/input/input_adapters.hpp
include/nlohmann/detail/input/lexer.hpp
include/nlohmann/detail/output/binary_writer.hpp
include/nlohmann/json.hpp
single_include/nlohmann/json.hpp
2020-06-27 13:14:48 +02:00
8b3d2399a4
🚨 remove warnings
2020-06-22 22:32:21 +02:00
0498202a03
🎨 replace alternative operators (and, not, or)
2020-06-03 14:20:36 +02:00
4350c5ed97
fix bug in issue#1972
2020-05-30 17:15:56 +08:00
904642f261
♻️ rename internal_binary_t with binary_t
2020-05-17 22:50:27 +02:00
dead99eb0e
🔨 overwork binary subtypes
2020-05-17 13:51:59 +02:00
daf2d296dd
♻️ move wrapped binary type to separate file
2020-05-15 14:12:32 +02:00
f0c6ab4d3b
🐛 fix bug in SAX callback parser
2020-05-08 14:21:11 +02:00
012c9665ac
Add binary type support to all binary file formats, as well as an internally represented binary type
2020-04-14 10:22:45 -04:00
90798caa62
🚚 rename Hedley macros
2019-07-01 22:37:30 +02:00
897362191d
🔨 add NLOHMANN_JSON prefix and undef macros
2019-07-01 22:24:39 +02:00
1720bfedd1
⚗️ add Hedley annotations
2019-06-30 22:14:02 +02:00
37a72dac48
💚 forgot two semicolons
2019-03-18 17:23:34 +01:00
8d3f4f21bc
🔨 clean up
2019-03-18 13:53:48 +01:00
56f6d1d68e
💚 fix CI and #1521
2019-03-17 15:20:22 +01:00
b8451c236f
🚨 fixed warnings
2019-03-17 12:01:49 +01:00
27011e3718
🚨 fixed warnings
2019-03-15 14:55:13 +01:00
3cd1dac653
🚨 fix MSVC warning #1502
2019-03-11 15:33:23 +01:00
5c04cc1009
🔨 fixed includes
2019-01-13 15:31:22 +01:00
e426219256
Merge pull request #1282 from nlohmann/feature/lines_columns
...
Improve diagnostic messages
2018-10-08 22:17:33 +02:00
f8158997b5
📝 fixed documentation
2018-10-07 21:30:58 +02:00
