Add has_nothrow_equal and has_nothrow_not_equal

KredeGC · Jun 23, 2023 · 8c33eb9 · 8c33eb9
1 parent 71a6784
commit 8c33eb9
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 14 deletions.
diff --git a/include/ktl/allocators/fallback.h b/include/ktl/allocators/fallback.h
@@ -85,13 +85,13 @@ namespace ktl
 		fallback& operator=(fallback&&) = default;
 
 		bool operator==(const fallback& rhs) const
-			noexcept(noexcept(m_Primary == rhs.m_Primary) && noexcept(m_Fallback == rhs.m_Fallback))
+			noexcept(detail::has_nothrow_equal_v<P> && detail::has_nothrow_equal_v<F>)
 		{
 			return m_Primary == rhs.m_Primary && m_Fallback == rhs.m_Fallback;
 		}
 
 		bool operator!=(const fallback& rhs) const
-			noexcept(noexcept(m_Primary != rhs.m_Primary) && noexcept(m_Fallback != rhs.m_Fallback))
+			noexcept(detail::has_nothrow_not_equal_v<P>&& detail::has_nothrow_not_equal_v<F>)
 		{
 			return m_Primary != rhs.m_Primary || m_Fallback != rhs.m_Fallback;
 		}

diff --git a/include/ktl/allocators/freelist.h b/include/ktl/allocators/freelist.h
@@ -91,13 +91,13 @@ namespace ktl
 		}
 
 		bool operator==(const freelist& rhs) const
-			noexcept(noexcept(m_Alloc == rhs.m_Alloc))
+			noexcept(detail::has_nothrow_equal_v<Alloc>)
 		{
 			return m_Alloc == rhs.m_Alloc && m_Free == rhs.m_Free;
 		}
 
 		bool operator!=(const freelist& rhs) const
-			noexcept(noexcept(m_Alloc != rhs.m_Alloc))
+			noexcept(detail::has_nothrow_not_equal_v<Alloc>)
 		{
 			return m_Alloc != rhs.m_Alloc || m_Free != rhs.m_Free;
 		}

diff --git a/include/ktl/allocators/overflow.h b/include/ktl/allocators/overflow.h
@@ -82,13 +82,13 @@ namespace ktl
 		overflow& operator=(overflow&&) = default;
 
 		bool operator==(const overflow& rhs) const
-			noexcept(noexcept(m_Alloc == rhs.m_Alloc))
+			noexcept(detail::has_nothrow_equal_v<Alloc>)
 		{
 			return m_Alloc == rhs.m_Alloc;
 		}
 
 		bool operator!=(const overflow& rhs) const
-			noexcept(noexcept(m_Alloc != rhs.m_Alloc))
+			noexcept(detail::has_nothrow_not_equal_v<Alloc>)
 		{
 			return m_Alloc != rhs.m_Alloc;
 		}

diff --git a/include/ktl/allocators/segragator.h b/include/ktl/allocators/segragator.h
@@ -82,13 +82,13 @@ namespace ktl
 		segragator& operator=(segragator&&) = default;
 
 		bool operator==(const segragator& rhs) const
-			noexcept(noexcept(m_Primary == rhs.m_Primary) && noexcept(m_Fallback == rhs.m_Fallback))
+			noexcept(detail::has_nothrow_equal_v<P> && detail::has_nothrow_equal_v<F>)
 		{
 			return m_Primary == rhs.m_Primary && m_Fallback == rhs.m_Fallback;
 		}
 
 		bool operator!=(const segragator& rhs) const
-			noexcept(noexcept(m_Primary != rhs.m_Primary) && noexcept(m_Fallback != rhs.m_Fallback))
+			noexcept(detail::has_nothrow_not_equal_v<P>&& detail::has_nothrow_not_equal_v<F>)
 		{
 			return m_Primary != rhs.m_Primary || m_Fallback != rhs.m_Fallback;
 		}

diff --git a/include/ktl/allocators/shared.h b/include/ktl/allocators/shared.h
@@ -91,13 +91,13 @@ namespace ktl
 		}
 
 		bool operator==(const shared& rhs) const
-			noexcept(noexcept(m_Block->Allocator == rhs.m_Block->Allocator))
+			noexcept(detail::has_nothrow_equal_v<Alloc>)
 		{
 			return m_Block == rhs.m_Block && m_Block->Allocator == rhs.m_Block->Allocator;
 		}
 
 		bool operator!=(const shared& rhs) const
-			noexcept(noexcept(m_Block->Allocator != rhs.m_Block->Allocator))
+			noexcept(detail::has_nothrow_not_equal_v<Alloc>)
 		{
 			return m_Block != rhs.m_Block || m_Block->Allocator != rhs.m_Block->Allocator;
 		}

diff --git a/include/ktl/allocators/threaded.h b/include/ktl/allocators/threaded.h
@@ -95,13 +95,13 @@ namespace ktl
 		}
 
 		bool operator==(const threaded& rhs) const
-			noexcept(noexcept(m_Block->Allocator == rhs.m_Block->Allocator))
+			noexcept(detail::has_nothrow_equal_v<Alloc>)
 		{
 			return m_Block == rhs.m_Block && m_Block->Allocator == rhs.m_Block->Allocator;
 		}
 
 		bool operator!=(const threaded& rhs) const
-			noexcept(noexcept(m_Block->Allocator != rhs.m_Block->Allocator))
+			noexcept(detail::has_nothrow_not_equal_v<Alloc>)
 		{
 			return m_Block != rhs.m_Block || m_Block->Allocator != rhs.m_Block->Allocator;
 		}

diff --git a/include/ktl/allocators/type_allocator.h b/include/ktl/allocators/type_allocator.h
@@ -177,14 +177,14 @@ namespace ktl
 
 	template<typename T, typename U, typename Alloc>
 	bool operator==(const type_allocator<T, Alloc>& lhs, const type_allocator<U, Alloc>& rhs)
-		noexcept(noexcept(lhs.get_allocator() == rhs.get_allocator()))
+		noexcept(detail::has_nothrow_equal_v<Alloc>)
 	{
 		return lhs.get_allocator() == rhs.get_allocator();
 	}
 
 	template<typename T, typename U, typename Alloc>
 	bool operator!=(const type_allocator<T, Alloc>& lhs, const type_allocator<U, Alloc>& rhs)
-		noexcept(noexcept(lhs.get_allocator() != rhs.get_allocator()))
+		noexcept(detail::has_nothrow_not_equal_v<Alloc>)
 	{
 		return lhs.get_allocator() != rhs.get_allocator();
 	}

diff --git a/include/ktl/utility/meta.h b/include/ktl/utility/meta.h
@@ -80,6 +80,14 @@ namespace ktl::detail
 	template<typename Alloc>
 	constexpr bool has_nothrow_deallocate_v = noexcept(std::declval<Alloc&>().deallocate(std::declval<void*>(), std::declval<size_t>()));
 
+	// has T& == T& noexcept
+	template<typename T>
+	constexpr bool has_nothrow_equal_v = noexcept(std::declval<T&>() == std::declval<T&>());
+
+	// has T& == T& noexcept
+	template<typename T>
+	constexpr bool has_nothrow_not_equal_v = noexcept(std::declval<T&>() == std::declval<T&>());
+
 	// has construct(T*, Args&&...) noexcept
 	template<typename Void, typename... Types>
 	struct has_nothrow_construct : std::false_type {};