From 643d2a683b478424847e3e9103dbf5e7c22121f1 Mon Sep 17 00:00:00 2001 From: Tim Schumacher Date: Tue, 13 Sep 2022 23:41:57 +0200 Subject: [PATCH] AK: Define both `::nullptr_t` and `std::nullptr_t` LLVM 15 switched around what it's basing its `nullptr_t` definitions on, it's now defining `std::nullptr_t` using `::nullptr_t` instead of the other way around. Work around any errors that result from that by just defining it both in the global namespace as well as in `std` ourselves. --- AK/Types.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/AK/Types.h b/AK/Types.h index b478185e601..7e8100cc46f 100644 --- a/AK/Types.h +++ b/AK/Types.h @@ -65,6 +65,8 @@ namespace std { // NOLINT(cert-dcl58-cpp) nullptr_t must be in ::std:: for some using nullptr_t = decltype(nullptr); } +using nullptr_t = std::nullptr_t; + static constexpr FlatPtr explode_byte(u8 b) { FlatPtr value = b;