2e928c39ae
🔀 merge develop
2024-11-17 07:45:45 +01:00
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
ad552c41be
🚨 fix warning
2024-11-08 23:41:46 +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
59da644db4
Add more specific error message when attempting to parse empty input ( #4180 )
2023-10-31 20:17:43 +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
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
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
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
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
523f7c2c9d
💡 update documentation
2021-08-08 13:24:17 +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
56a6dec0de
🔀 merge develop branch
2021-02-07 17:46:11 +01:00
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
ffdeb77468
🚨 fix warnings #2615
2021-01-27 12:54:46 +01:00
74cc0ab470
♻️ remove diagnostics_t class
2021-01-25 13:47:50 +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
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
74520d8bb0
🚧 extend API
2020-06-17 22:03:14 +02:00
0498202a03
🎨 replace alternative operators (and, not, or)
2020-06-03 14:20:36 +02:00
2e2cf02cfd
duck-typed object input adapters
2020-02-19 14:59:31 -05:00
617b3cf42e
templated input adapters
2020-02-19 10:32:49 -05:00
7acf6218b6
📝 fix typo #1903
2020-01-15 17:40:03 +01: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
b224c52376
🎨 cleanup
2019-03-19 09:17:14 +01:00
8d3f4f21bc
🔨 clean up
2019-03-18 13:53:48 +01:00
b8451c236f
🚨 fixed warnings
2019-03-17 12:01:49 +01:00
27011e3718
🚨 fixed warnings
2019-03-15 14:55:13 +01:00
d2e4f0b0d9
✏️ fixed some typos
2018-10-28 14:20:20 +01:00
e426219256
Merge pull request #1282 from nlohmann/feature/lines_columns
...
Improve diagnostic messages
2018-10-08 22:17:33 +02:00
74a31075e3
♿ improved parse error messages
2018-10-07 22:39:17 +02:00
3abb788139
🚨 fixed some more clang-tidy warnings
2018-10-07 19:07:58 +02:00
858e75c4df
🚨 fixed some clang-tidy warnings
2018-10-07 18:39:18 +02:00
07494e06d7
🚨 fixed some compiler warnings
2018-08-16 18:20:30 +02:00
0cc3db4f15
add static_asserts on SAX interface
2018-08-16 11:59:57 +02:00
442886d040
use templates in the sax interface instead of virtuals
2018-08-16 11:58:52 +02:00
ba6edd5634
🔨 cleanup
2018-03-30 00:38:18 +02:00
850671b9f1
🔨 using a vector<bool> for the parser hierarchy
2018-03-29 18:45:43 +02:00
5f723bbec6
🔨 realized callback parser wirh SAX interface #971
2018-03-28 23:39:39 +02:00
4f6b2b6429
🔨 changed SAX interface
2018-03-21 20:12:06 +01:00
