summaryrefslogtreecommitdiff
path: root/Kernel
diff options
context:
space:
mode:
authorAli Mohammad Pur <ali.mpfard@gmail.com>2022-12-13 10:29:30 +0330
committerAndreas Kling <kling@serenityos.org>2022-12-14 11:44:32 +0100
commitf96a3c002aa994d5811a677bd93553ccf9a8abf1 (patch)
treec22c82871d944c345bc6bad1e21d57f37800d1f4 /Kernel
parent72514d6915a685552a258d2e4c85d9d52184c1b6 (diff)
downloadserenity-f96a3c002aa994d5811a677bd93553ccf9a8abf1.zip
Everywhere: Stop shoving things into ::std and mentioning them as such
Note that this still keeps the old behaviour of putting things in std by default on serenity so the tools can be happy, but if USING_AK_GLOBALLY is unset, AK behaves like a good citizen and doesn't try to put things in the ::std namespace. std::nothrow_t and its friends get to stay because I'm being told that compilers assume things about them and I can't yeet them into a different namespace...for now.
Diffstat (limited to 'Kernel')
-rw-r--r--Kernel/Library/LockRefPtr.h8
-rw-r--r--Kernel/Library/LockWeakPtr.h2
2 files changed, 5 insertions, 5 deletions
diff --git a/Kernel/Library/LockRefPtr.h b/Kernel/Library/LockRefPtr.h
index 4222e17e4f..4c7aeb70f3 100644
--- a/Kernel/Library/LockRefPtr.h
+++ b/Kernel/Library/LockRefPtr.h
@@ -113,7 +113,7 @@ struct LockRefPtrTraits {
static constexpr FlatPtr default_null_value = 0;
- using NullType = std::nullptr_t;
+ using NullType = nullptr_t;
};
template<typename T, typename PtrTraits>
@@ -284,7 +284,7 @@ public:
return *this;
}
- LockRefPtr& operator=(std::nullptr_t)
+ LockRefPtr& operator=(nullptr_t)
{
clear();
return *this;
@@ -353,8 +353,8 @@ public:
ALWAYS_INLINE operator bool() { return !is_null(); }
- bool operator==(std::nullptr_t) const { return is_null(); }
- bool operator!=(std::nullptr_t) const { return !is_null(); }
+ bool operator==(nullptr_t) const { return is_null(); }
+ bool operator!=(nullptr_t) const { return !is_null(); }
bool operator==(LockRefPtr const& other) const { return as_ptr() == other.as_ptr(); }
bool operator!=(LockRefPtr const& other) const { return as_ptr() != other.as_ptr(); }
diff --git a/Kernel/Library/LockWeakPtr.h b/Kernel/Library/LockWeakPtr.h
index 184be112f3..f6bacbe6b7 100644
--- a/Kernel/Library/LockWeakPtr.h
+++ b/Kernel/Library/LockWeakPtr.h
@@ -49,7 +49,7 @@ public:
return *this;
}
- LockWeakPtr& operator=(std::nullptr_t)
+ LockWeakPtr& operator=(nullptr_t)
{
clear();
return *this;