1
0
mirror of https://github.com/nlohmann/json synced 2024-11-30 15:40:07 +00:00
Commit Graph

4589 Commits

Author SHA1 Message Date
Niels Lohmann
83dc915ac2
🚑 fix warning 2024-11-08 22:48:11 +01:00
Niels Lohmann
88318f9a77
🔀 merge develop 2024-11-08 22:40:55 +01:00
Niels Lohmann
fd968125e8
🚨 fix warning 2024-04-15 22:50:47 +02:00
Niels Lohmann
3c282210d6
🚨 fix warning 2024-04-15 21:44:44 +02:00
Niels Lohmann
751b93652f
🚨 fix warning 2024-04-15 21:44:33 +02:00
Niels Lohmann
bb2468a52c
🚨 fix warning 2024-04-15 21:16:40 +02:00
Niels Lohmann
4b7721c392
🚨 fix warning 2024-04-14 13:56:22 +02:00
Niels Lohmann
e8cfe1f712
🚨 fix warning 2024-04-14 12:38:17 +02:00
Niels Lohmann
760f54f993
🚨 fix warning 2024-04-14 12:01:20 +02:00
Niels Lohmann
414345eef9
🚨 fix warning 2024-04-13 14:59:13 +02:00
Niels Lohmann
8ef27594d1
🚨 fix warning 2024-03-26 17:25:26 +01:00
Niels Lohmann
91be9e0175
🚨 fix warning 2024-03-15 19:24:59 +01:00
Niels Lohmann
22d3ee930e
🚨 fix warning 2024-03-15 18:57:27 +01:00
Niels Lohmann
cc4d7f1697
🚨 fix warning 2024-03-15 18:33:24 +01:00
Niels Lohmann
7b89d3ab29
🚨 fix warning 2024-03-15 17:32:27 +01:00
Niels Lohmann
b131d285ed
🚨 fix warning 2024-03-15 17:27:37 +01:00
Niels Lohmann
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
Niels Lohmann
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
alferov
7efe875495
Update json_has_static_rtti.md (#4269) 2024-01-18 19:21:53 +01:00
Juan Carlos Arevalo Baeza
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
Niels Lohmann
3780b41dd0
💰 update sponsors 2023-12-06 20:51:04 +01:00
Niels Lohmann
9cca280a4d
JSON for Modern C++ 3.11.3 (#4222) 2023-11-28 22:36:31 +01:00
Colby Haskell
1d597743d8
Fix char_traits deprecation warning (#4179) 2023-11-27 06:51:25 +01:00
Niels Lohmann
f56c6e2e30
Update documentation for the next release (#4216) 2023-11-26 15:51:19 +01:00
Vyacheslav Zhdanovskiy
360ce457f4
Add serialization-only user defined type macros (#3816) 2023-11-26 13:18:20 +01:00
Colby Haskell
5d931c59a3
Fix failing CI checks (#4215) 2023-11-25 18:04:59 +01:00
Niels Lohmann
6eab7a2b18
💚 fix documentation deploy 2023-11-01 22:16:27 +01:00
Niels Lohmann
1dfe4073e3
💚 fix documentation deploy 2023-11-01 22:09:53 +01:00
Niels Lohmann
4ffd5bd18e
💚 fix documentation deploy 2023-11-01 22:06:01 +01:00
Niels Lohmann
0261bc04d3
Fix CI (again) (#4196) 2023-11-01 21:23:55 +01:00
Colby Haskell
59da644db4
Add more specific error message when attempting to parse empty input (#4180) 2023-10-31 20:17:43 +01:00
Benjamin Buch
cdb29069da
fix cmake header path in install with custom CMAKE_INSTALL_INCLUDEDIR (#4194) 2023-10-31 19:52:54 +01:00
Aleksei Sapitskii
58d6aa5831
Support Apple's Swift Package Manager (#4010)
Co-authored-by: Aleksei <sapial@f-secure.com>
2023-10-21 19:41:10 +02:00
scribam
edffad036d
Fix MinGW CI (#4175) 2023-10-04 22:16:48 +02:00
Mathieu Westphal
6adae02ddd
Fix spellcheck issue (#4173) 2023-10-04 15:24:38 +02:00
Vyacheslav Zhdanovskiy
35c0b3e54c
Fix source highlighting in user defined type macros docs (#4169) 2023-10-02 13:09:53 +02:00
Craig Scott
fac07e22c5
Accept NEW CMake policies up to CMake 3.14 (#4112)
Starting with CMake 3.27, deprecation warnings are issued
when asking for policy settings for CMake 3.4 or earlier.
The cmake_minimum_required() command accepts a version
range, which allows NEW policy settings up to the upper end
of that range to be used, but without raising the minimum
CMake version above the bottom of that range. This means
NEW policy settings will be used where available, without
requiring them. This change updates the project's
cmake_minimum_required() calls to use a version range to
extend the upper policy version to 3.14 where it wasn't already
at that version or higher. This prevents the deprecation warning
from CMake 3.27, and gives breathing space before a future
CMake release will start issuing similar deprecation warnings
again.
2023-09-25 09:31:26 +02:00
alferov
6d4b72d3c3
Fix compile error with _HAS_STATIC_RTTI=0 (#4046) 2023-09-24 11:23:41 +02:00
Niels Lohmann
bbd2e1636d
Fix deprecation warning (#4161) 2023-09-23 20:16:37 +02:00
tomalakgeretkal
6e36c721f0
Fixed init-list construction when size_type is not int (#4140) 2023-09-23 17:21:40 +02:00
miny1233
e75b94b31e
Update index.md (#4159) 2023-09-23 17:20:47 +02:00
Ivor Wanders
aa87ab8b40
Capture exceptions by const& in docs. (#4099) 2023-09-23 17:19:50 +02:00
Niels Lohmann
1ce29fa22f
Fix CI (#4160) 2023-09-23 17:19:28 +02:00
HO-COOH
5fec803493
Update index.md (#4149) 2023-09-14 17:46:34 +02:00
Felix Yan
da92c0e3e7
Correct a typo in serve_header/README.md (#4143) 2023-09-10 21:49:38 +02:00
Niels Lohmann
836b7beca4
Fix CI, again (#4083) 2023-09-07 20:41:12 +02:00
Ikko Eltociear Ashimine
788e5468e4
Fix typo in afl_driver.cpp (#4109) 2023-09-02 17:16:33 +02:00
taro
6cc0eaf88f
Update CODEOWNERS (#4126) 2023-08-28 22:04:08 +02:00