File tree Expand file tree Collapse file tree
include/nlohmann/detail/conversions Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -76,6 +76,7 @@ violations will result in a failed build.
7676 | GNU 13.3.0 | x86_64 | Ubuntu 22.04.1 LTS | GitHub |
7777 | GNU 14.2.0 | x86_64 | Ubuntu 22.04.1 LTS | GitHub |
7878 | GNU 14.2.0 | arm64 | Linux 6.1.100 | Cirrus CI |
79+ | GNU 15.1.0 | x86_64 | Ubuntu 22.04.1 LTS | GitHub |
7980 | icpc (ICC) 2021.5.0 20211109 | x86_64 | Ubuntu 20.04.3 LTS | GitHub |
8081 | MSVC 19.0.24241.7 | x86 | Windows 8.1 | AppVeyor |
8182 | MSVC 19.16.27035.0 | x86 | Windows-10 (Build 14393) | AppVeyor |
Original file line number Diff line number Diff line change 3434 #include < optional> // optional
3535#endif
3636
37+ #if JSON_HAS_FILESYSTEM || JSON_HAS_EXPERIMENTAL_FILESYSTEM
38+ #include < string_view> // u8string_view
39+ #endif
40+
3741NLOHMANN_JSON_NAMESPACE_BEGIN
3842namespace detail
3943{
Original file line number Diff line number Diff line change @@ -4819,6 +4819,10 @@ NLOHMANN_JSON_NAMESPACE_END
48194819 #include <optional> // optional
48204820#endif
48214821
4822+ #if JSON_HAS_FILESYSTEM || JSON_HAS_EXPERIMENTAL_FILESYSTEM
4823+ #include <string_view> // u8string_view
4824+ #endif
4825+
48224826NLOHMANN_JSON_NAMESPACE_BEGIN
48234827namespace detail
48244828{
Original file line number Diff line number Diff line change @@ -396,7 +396,7 @@ struct Example_3810
396396 Example_3810 () = default ;
397397};
398398
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)
400400
401401// ///////////////////////////////////////////////////////////////////
402402// for #4740
Original file line number Diff line number Diff line change @@ -60,12 +60,12 @@ TEST_CASE("Custom container member begin/end")
6060 {
6161 const char * data;
6262
63- const char * begin () const
63+ const char * begin () const noexcept
6464 {
6565 return data;
6666 }
6767
68- const char * end () const
68+ const char * end () const noexcept
6969 {
7070 return data + strlen (data); // NOLINT(cppcoreguidelines-pro-bounds-pointer-arithmetic)
7171 }
You can’t perform that action at this time.
0 commit comments