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
7b89d3ab29
🚨 fix warning
2024-03-15 17:32:27 +01:00
b131d285ed
🚨 fix warning
2024-03-15 17:27:37 +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
ab06fc9951
Fix Clang-Tidy warnings ( #4047 )
2023-06-08 18:46:48 +02:00
f7973f46d6
Use official Clang/GCC containers ( #3703 )
2022-08-27 17:28:50 +02: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
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
44d60f8d14
All: fix warnings when compiling with -Wswitch-enum
...
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl >
2021-08-12 16:33:50 +02: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
6d4eed5aeb
🚨 fix warning
2021-01-30 12:51:54 +01:00
ffdeb77468
🚨 fix warnings #2615
2021-01-27 12:54:46 +01: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
0ecf297457
drop std::enable_if part
2020-06-23 09:14:55 +08:00
aeef50709e
to allow for ADL in int_to_string() function
2020-06-22 20:17:56 +08:00
691fb0c57a
fix issue#2059
2020-06-16 15:35:26 +08:00
0498202a03
🎨 replace alternative operators (and, not, or)
2020-06-03 14:20:36 +02:00
35b47c2793
iteration_proxy: Fix integer truncation from std::size_t to int
...
Bug introduced in 0f073e26
2019-10-16 20:00:05 +02:00
4615f5a980
Provide default implementation for int_to_string, but allow for overloaded function
2019-10-01 10:34:21 +02:00
0f073e26eb
Allow items() to be used with custom string
2019-09-26 13:20:57 +02:00
b8451c236f
🚨 fixed warnings
2019-03-17 12:01:49 +01:00
27011e3718
🚨 fixed warnings
2019-03-15 14:55:13 +01:00
45819dce54
Disable -Wmismatched-tags warning on tuple_size / tuple_element
2019-01-30 12:59:50 -05:00
e5753b14a8
🚨 fixed another linter warning #1400
...
Closes #1400 .
2019-01-13 15:40:49 +01:00
45f5611d9b
🚨 fixed two warnings
2018-12-20 22:41:48 +01:00
ebd3f45808
Added Support for Structured Bindings
...
For further details, read https://github.com/nlohmann/json/issues/1388 and https://blog.tartanllama.xyz/structured-bindings/
2018-12-19 20:17:52 +05:30
858e75c4df
🚨 fixed some clang-tidy warnings
2018-10-07 18:39:18 +02:00
86a96b059d
Merge pull request #1134 from Daniel599/feature/items_iterator
...
fixed compile error for #1045
2018-06-28 21:21:17 +02:00
481ace65c4
🔨 only calculate array index string when needed #1098
2018-05-27 12:04:22 +02:00
90eb0a91e0
⚡ keys are now returned as const reference #1098
2018-05-26 13:26:40 +02:00
8d8f890771
💩 first try on #1045
2018-04-10 08:29:07 +02:00
14cd019861
fix cmake install directory (for real this time)
...
* Rename 'develop' folder to 'include/nlohmann'
* Rename 'src' folder to 'single_include/nlohmann'
* Use <nlohmann/*> headers in sources and tests
* Change amalgamate config file
2018-02-01 11:06:51 +01:00
