From 7d236bffdf7bf943279d65f9dc38d52dcaabf830 Mon Sep 17 00:00:00 2001 From: Xottab-DUTY Date: Sun, 2 Jun 2024 17:46:49 +0500 Subject: [PATCH] Properly fix builds for platforms with nullptr missing from global space --- src/Common/PlatformLinux.inl | 1 - src/xrCore/xrstring.h | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/Common/PlatformLinux.inl b/src/Common/PlatformLinux.inl index fcdf140c8a2..a65ea5b68fe 100644 --- a/src/Common/PlatformLinux.inl +++ b/src/Common/PlatformLinux.inl @@ -12,7 +12,6 @@ #include // for PAGESIZE... #include #include -#include #include // for min max diff --git a/src/xrCore/xrstring.h b/src/xrCore/xrstring.h index 2c0b837450d..e0d42e6fee0 100644 --- a/src/xrCore/xrstring.h +++ b/src/xrCore/xrstring.h @@ -88,7 +88,7 @@ class shared_str _dec(); p_ = v; } - void _set(nullptr_t) noexcept + void _set(std::nullptr_t) noexcept { _dec(); p_ = nullptr; @@ -133,7 +133,7 @@ class shared_str rhs.p_ = nullptr; return *this; } - shared_str& operator=(nullptr_t) noexcept + shared_str& operator=(std::nullptr_t) noexcept { _set(nullptr); return *this;