1
0
mirror of https://github.com/nlohmann/json.git synced 2025-07-15 07:41:50 +03:00
Commit Graph

4612 Commits

Author SHA1 Message Date
2e928c39ae 🔀 merge develop 2024-11-17 07:45:45 +01:00
a65d65c724 🔀 merge develop 2024-11-16 23:25:05 +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
9561a122a3 🚨 fix warning 2024-11-08 23:47:11 +01:00
ad552c41be 🚨 fix warning 2024-11-08 23:41:46 +01:00
078d25ed68 🚨 fix warning 2024-11-08 23:19:04 +01:00
ddecb704e3 🚨 fix warning 2024-11-08 23:13:25 +01:00
9240ba4911 Merge remote-tracking branch 'origin/clang-tidy' into clang-tidy 2024-11-08 23:07:51 +01:00
b48e05be7c 💚 update actions 2024-11-08 23:07:44 +01:00
c4ec5e0bc5 Merge branch 'develop' into clang-tidy 2024-11-08 22:49:30 +01:00
83dc915ac2 🚑 fix warning 2024-11-08 22:48:11 +01:00
88318f9a77 🔀 merge develop 2024-11-08 22:40:55 +01:00
18ff442e63 Allow overriding the CMake target name (#4483) 2024-11-08 21:42:36 +01:00
aff5a31d35 Add NLOHMANN_DEFINE_DERIVED_TYPE_* macros (#4033)
* Add NLOHMANN_DEFINE_DERIVED_TYPE_* macros

* Fix with amalgamate

* Add documentation

* Fix with amalgamate

* Fix with amalgamate

---------

Co-authored-by: Niccolò Iardella <niccolo.iardella@doriansrl.it>
2024-11-08 21:41:19 +01:00
ac8b22180d Update CONTRIBUTING.md (#4486)
Typo in the filename.
2024-11-04 17:45:58 +01:00
6325839776 Update is_structured.md (#4472) 2024-10-08 06:53:32 +02:00
b36f4c477c Update natvis to reflect 3.11.3 and the current structure of basic_json (#4451)
* Update natvis Jinja template to reflect the current structure of basic_json.

In 5a1a57510a the underlying structure of
basic_json was altered to move m_type and m_value under an m_data field.
This updates the nativ template to be consistent with this change.

* Generate nlohmann_json.natvis for 3.11.3 and latest basic_json structure.
2024-09-05 20:28:24 +02:00
960b763ecd Docs: fix typos of 'whether' in operator_{gt,le,lt}.md (#4412) 2024-07-07 10:22:17 +02:00
fd968125e8 🚨 fix warning 2024-04-15 22:50:47 +02:00
3c282210d6 🚨 fix warning 2024-04-15 21:44:44 +02:00
751b93652f 🚨 fix warning 2024-04-15 21:44:33 +02:00
bb2468a52c 🚨 fix warning 2024-04-15 21:16:40 +02:00
4b7721c392 🚨 fix warning 2024-04-14 13:56:22 +02:00
e8cfe1f712 🚨 fix warning 2024-04-14 12:38:17 +02:00
760f54f993 🚨 fix warning 2024-04-14 12:01:20 +02:00
414345eef9 🚨 fix warning 2024-04-13 14:59:13 +02:00
8c391e04fe Docs: Fix wrong code usage in the Value access section of json_pointer.md (#4255) 2024-04-13 14:15:00 +02:00
01da82eae2 Fix gdb pretty printer (#4343) 2024-04-13 14:11:49 +02:00
97f0bdaf9a chore: fix some typos in comments (#4345)
chore: fix some typos in comments

Signed-off-by: laterlaugh <manziwenzhai@sina.cn>
2024-04-12 15:20:18 +02:00
c883fb0f17 Fix for incorrect function name in documentation example (#4342) 2024-04-10 18:17:47 +02:00
377c767aa1 Updated exception handling to catch const reference in out_of_range (#4331)
Co-authored-by: LeilaSh <leilanagieva81@gmail.com>
2024-04-08 21:12:32 +02:00
16b3d841d5 Fixed an error in the Custom data source example. (#4335) 2024-04-08 21:11:25 +02:00
8ef27594d1 🚨 fix warning 2024-03-26 17:25:26 +01:00
91be9e0175 🚨 fix warning 2024-03-15 19:24:59 +01:00
22d3ee930e 🚨 fix warning 2024-03-15 18:57:27 +01:00
cc4d7f1697 🚨 fix warning 2024-03-15 18:33:24 +01:00
7b89d3ab29 🚨 fix warning 2024-03-15 17:32:27 +01:00
b131d285ed 🚨 fix warning 2024-03-15 17:27:37 +01:00
199dea11b1 #4307 Updated docx to 3.10.5 from 3.10.4 (#4310) 2024-03-15 13:12:21 +01:00
57e22b996e 🚨 suppress warning 2024-03-15 13:08:10 +01:00
ss
0457de21cf Align astyle flags in Makefile with CI (#4277)
Remove unsupported `--squeeze-lines=2` parameter

Fixes #4275
2024-01-28 20:25:22 +01:00
c35d260c2f Suppress Clang-Tidy warnings (#4276) 2024-01-28 14:04:07 +01:00
ss
6a064e026a Remove broken link from CONTRIBUTING.md (#4274)
http://issuestats.com domain does not exist anymore
2024-01-28 08:55:49 +01:00
7efe875495 Update json_has_static_rtti.md (#4269) 2024-01-18 19:21:53 +01:00
a259ecc51e Fix to_json for enums when the enum has an unsigned underlying type. (#4237)
* Enhance the UDT unit test to expose the issue

Add a new enum type with uint64_t as the underlying type.
Use it in the overall UDT. Not strictly needed, but it helps exercise its expected usage.
Create an object of this enum type with a large value (negative if cast to int64_t).
Perform several checks on this object as converted to `json`, which fail without the fix.

* Fix the issue in the relevant `to_json` overload.

Select the correct json type depending on the signedness of the enum's underlying type.
This fixes the new checks in the unit test.

* Add the fix to the single_include

I ran `make pretty` but that modified 20 files, performing a significant amount of indentation changes, none of them related to my change.
I ran `make amalgamate`, but that did nothing. Apparently, the make rule won't run if the single_include files have already been updated by `make pretty`.
I forced `make amalgamate` to do the work by touching the file with the fix.
I then decided to keep just the minimal needed change: the addition of the fix to the single_include file.

I just am not conversant enough in Linux to know whether I installed astyle correctly (had to clone the source from a beta branch and build, in order to get support for `--squeeze-lines`).

* Resolve CI errors and use qualified `std::uint64_t`

The fix was relying on implicit conversions in the non-taken branch.
- Ordinarily (work on a C++20 codebase) I would have used `if constexpr` here, sidestepping the issue, but that's not available on C++11 so I didn't bother.
- So instead of an `if` statement, I used a compile-time constant to select the correct overload.
- This is arguably better in this case, anyway.

I was using function-style casts for typed constants, which I consider superior for constants, but the CI checks disagree, so changed all to `static_cast`.
- For some reason, the CI checks didn't point at all of them, so I hope I caught them all myself.

Built with clang14 and all unit tests pass.

---------

Co-authored-by: Juan Carlos Arevalo Baeza (JCAB) <jcab@ntdev.microsoft.com>
2023-12-14 09:26:10 +01:00
3780b41dd0 💰 update sponsors 2023-12-06 20:51:04 +01:00
9cca280a4d JSON for Modern C++ 3.11.3 (#4222) v3.11.3 2023-11-28 22:36:31 +01:00
1d597743d8 Fix char_traits deprecation warning (#4179) 2023-11-27 06:51:25 +01:00
f56c6e2e30 Update documentation for the next release (#4216) 2023-11-26 15:51:19 +01:00
360ce457f4 Add serialization-only user defined type macros (#3816) 2023-11-26 13:18:20 +01:00