Use requires syntax in more places

RPCS3 · Apr 19, 2021 · f5f57ee · f5f57ee
1 parent 7dae376
commit f5f57ee
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 35 deletions.
diff --git a/Utilities/Thread.h b/Utilities/Thread.h
@@ -480,8 +480,7 @@ class named_thread final : public Context, result_storage<Context>, thread_base
 
 public:
 	// Default constructor
-	template <bool Valid = std::is_default_constructible_v<Context> && thread_thread_name<Context>(), typename = std::enable_if_t<Valid>>
-	named_thread()
+	named_thread() requires (std::is_default_constructible_v<Context>) && (thread_thread_name<Context>::value)
 		: Context()
 		, thread(trampoline, Context::thread_name)
 	{

diff --git a/rpcs3/util/shared_ptr.hpp b/rpcs3/util/shared_ptr.hpp
@@ -97,13 +97,13 @@ namespace stx
 		atomic_t<usz> refs{1};
 	};
 
-	template <usz Size, usz Align, typename = void>
+	template <usz Size, usz Align>
 	struct align_filler
 	{
 	};
 
-	template <usz Size, usz Align>
-	struct align_filler<Size, Align, std::enable_if_t<(Align > Size)>>
+	template <usz Size, usz Align> requires (Align > Size)
+	struct align_filler<Size, Align>
 	{
 		char dummy[Align - Size];
 	};
@@ -236,30 +236,19 @@ namespace stx
 			return m_ptr;
 		}
 
-		decltype(auto) operator*() const noexcept
+		decltype(auto) operator*() const noexcept requires (!std::is_void_v<element_type>)
 		{
-			if constexpr (std::is_void_v<element_type>)
-			{
-				return;
-			}
-			else
-			{
-				return *m_ptr;
-			}
+			return *m_ptr;
 		}
 
 		element_type* operator->() const noexcept
 		{
 			return m_ptr;
 		}
 
-		decltype(auto) operator[](std::ptrdiff_t idx) const noexcept
+		decltype(auto) operator[](std::ptrdiff_t idx) const noexcept requires (!std::is_void_v<element_type>)
 		{
-			if constexpr (std::is_void_v<element_type>)
-			{
-				return;
-			}
-			else if constexpr (std::is_array_v<T>)
+			if constexpr (std::is_array_v<T>)
 			{
 				return m_ptr[idx];
 			}
@@ -572,30 +561,19 @@ namespace stx
 			return m_ptr;
 		}
 
-		decltype(auto) operator*() const noexcept
+		decltype(auto) operator*() const noexcept requires (!std::is_void_v<element_type>)
 		{
-			if constexpr (std::is_void_v<element_type>)
-			{
-				return;
-			}
-			else
-			{
-				return *m_ptr;
-			}
+			return *m_ptr;
 		}
 
 		element_type* operator->() const noexcept
 		{
 			return m_ptr;
 		}
 
-		decltype(auto) operator[](std::ptrdiff_t idx) const noexcept
+		decltype(auto) operator[](std::ptrdiff_t idx) const noexcept requires (!std::is_void_v<element_type>)
 		{
-			if constexpr (std::is_void_v<element_type>)
-			{
-				return;
-			}
-			else if constexpr (std::is_array_v<T>)
+			if constexpr (std::is_array_v<T>)
 			{
 				return m_ptr[idx];
 			}