File tree 5 files changed +12
-3
lines changed
include/nlohmann/detail/conversions 5 files changed +12
-3
lines changed Original file line number Diff line number Diff line change @@ -76,6 +76,7 @@ violations will result in a failed build.
76
76
| GNU 13.3.0 | x86_64 | Ubuntu 22.04.1 LTS | GitHub |
77
77
| GNU 14.2.0 | x86_64 | Ubuntu 22.04.1 LTS | GitHub |
78
78
| GNU 14.2.0 | arm64 | Linux 6.1.100 | Cirrus CI |
79
+ | GNU 15.1.0 | x86_64 | Ubuntu 22.04.1 LTS | GitHub |
79
80
| icpc (ICC) 2021.5.0 20211109 | x86_64 | Ubuntu 20.04.3 LTS | GitHub |
80
81
| MSVC 19.0.24241.7 | x86 | Windows 8.1 | AppVeyor |
81
82
| MSVC 19.16.27035.0 | x86 | Windows-10 (Build 14393) | AppVeyor |
Original file line number Diff line number Diff line change 34
34
#include < optional> // optional
35
35
#endif
36
36
37
+ #if JSON_HAS_FILESYSTEM || JSON_HAS_EXPERIMENTAL_FILESYSTEM
38
+ #include < string_view> // u8string_view
39
+ #endif
40
+
37
41
NLOHMANN_JSON_NAMESPACE_BEGIN
38
42
namespace detail
39
43
{
Original file line number Diff line number Diff line change @@ -4819,6 +4819,10 @@ NLOHMANN_JSON_NAMESPACE_END
4819
4819
#include <optional> // optional
4820
4820
#endif
4821
4821
4822
+ #if JSON_HAS_FILESYSTEM || JSON_HAS_EXPERIMENTAL_FILESYSTEM
4823
+ #include <string_view> // u8string_view
4824
+ #endif
4825
+
4822
4826
NLOHMANN_JSON_NAMESPACE_BEGIN
4823
4827
namespace detail
4824
4828
{
Original file line number Diff line number Diff line change @@ -396,7 +396,7 @@ struct Example_3810
396
396
Example_3810 () = default ;
397
397
};
398
398
399
- NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE (Example_3810, bla); // NOLINT(misc-use-internal-linkage)
399
+ NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE (Example_3810, bla) // NOLINT(misc-use-internal-linkage)
400
400
401
401
// ///////////////////////////////////////////////////////////////////
402
402
// for #4740
Original file line number Diff line number Diff line change @@ -60,12 +60,12 @@ TEST_CASE("Custom container member begin/end")
60
60
{
61
61
const char * data;
62
62
63
- const char * begin () const
63
+ const char * begin () const noexcept
64
64
{
65
65
return data;
66
66
}
67
67
68
- const char * end () const
68
+ const char * end () const noexcept
69
69
{
70
70
return data + strlen (data); // NOLINT(cppcoreguidelines-pro-bounds-pointer-arithmetic)
71
71
}
You can’t perform that action at this time.
0 commit comments