Skip to content

Commit

Permalink
Properly fix builds for platforms with nullptr missing from global space
Browse files Browse the repository at this point in the history
  • Loading branch information
Xottab-DUTY committed Jun 2, 2024
1 parent 6a16bdc commit 7d236bf
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
1 change: 0 additions & 1 deletion src/Common/PlatformLinux.inl
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
#include <limits.h> // for PAGESIZE...
#include <math.h>
#include <sched.h>
#include <stddef.h>

#include <algorithm> // for min max

Expand Down
4 changes: 2 additions & 2 deletions src/xrCore/xrstring.h
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ class shared_str
_dec();
p_ = v;
}
void _set(nullptr_t) noexcept
void _set(std::nullptr_t) noexcept
{
_dec();
p_ = nullptr;
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 7d236bf

Please sign in to comment.