Skip to content

Commit 6b91993

Browse files
authored
Add missing header (#4763)
* 🐛 add missing header Signed-off-by: Niels Lohmann <[email protected]> * 🚨 fix warning Signed-off-by: Niels Lohmann <[email protected]> * 🚨 fix warning Signed-off-by: Niels Lohmann <[email protected]> --------- Signed-off-by: Niels Lohmann <[email protected]>
1 parent 51a77f1 commit 6b91993

File tree

5 files changed

+12
-3
lines changed

5 files changed

+12
-3
lines changed

docs/mkdocs/docs/community/quality_assurance.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff 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 |

include/nlohmann/detail/conversions/from_json.hpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@
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+
3741
NLOHMANN_JSON_NAMESPACE_BEGIN
3842
namespace detail
3943
{

single_include/nlohmann/json.hpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff 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+
48224826
NLOHMANN_JSON_NAMESPACE_BEGIN
48234827
namespace detail
48244828
{

tests/src/unit-regression2.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff 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

tests/src/unit-user_defined_input.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff 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
}

0 commit comments

Comments
 (0)