From d06057f88b6c6d8f629f93b097773b54bbc6ebd8 Mon Sep 17 00:00:00 2001 From: Ali Mohammad Pur Date: Fri, 28 Apr 2023 04:31:15 +0330 Subject: [PATCH] AK: Don't refer to AK::swap() as ::swap() While swap() is available in the global namespace in normal conditions, !USING_AK_GLOBALLY will make this name unavailable in the global namespace, making these calls fail to compile. --- AK/FixedArray.h | 2 +- AK/NonnullOwnPtr.h | 4 ++-- AK/OwnPtr.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/AK/FixedArray.h b/AK/FixedArray.h index 0eb8a22c74..ac60f4052c 100644 --- a/AK/FixedArray.h +++ b/AK/FixedArray.h @@ -142,7 +142,7 @@ public: void swap(FixedArray& other) { - ::swap(m_storage, other.m_storage); + AK::swap(m_storage, other.m_storage); } void fill_with(T const& value) diff --git a/AK/NonnullOwnPtr.h b/AK/NonnullOwnPtr.h index 4c73a246eb..8dd798c22d 100644 --- a/AK/NonnullOwnPtr.h +++ b/AK/NonnullOwnPtr.h @@ -110,13 +110,13 @@ public: void swap(NonnullOwnPtr& other) { - ::swap(m_ptr, other.m_ptr); + AK::swap(m_ptr, other.m_ptr); } template void swap(NonnullOwnPtr& other) { - ::swap(m_ptr, other.m_ptr); + AK::swap(m_ptr, other.m_ptr); } template diff --git a/AK/OwnPtr.h b/AK/OwnPtr.h index e1c3e40d97..2ccb0c3f9a 100644 --- a/AK/OwnPtr.h +++ b/AK/OwnPtr.h @@ -152,13 +152,13 @@ public: void swap(OwnPtr& other) { - ::swap(m_ptr, other.m_ptr); + AK::swap(m_ptr, other.m_ptr); } template void swap(OwnPtr& other) { - ::swap(m_ptr, other.m_ptr); + AK::swap(m_ptr, other.m_ptr); } static OwnPtr lift(T* ptr)