fix

from Siv3D/OpenSiv3D#1213
Siv3D · Mar 16, 2024 · a27a526 · a27a526
1 parent 3268de7
commit a27a526
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/Siv3D/include/Siv3D/AsyncTask.hpp b/Siv3D/include/Siv3D/AsyncTask.hpp
@@ -57,7 +57,7 @@ namespace s3d
 		/// @remark 参照を渡す場合は `std::ref()` を使ってください。
 		template <class Fty, class... Args>
 		[[nodiscard]]
-		explicit AsyncTask(Fty&& f, Args&&... args) requires std::invocable<Fty, Args...>;
+		explicit AsyncTask(Fty&& f, Args&&... args) requires std::invocable<std::decay_t<Fty>, std::decay_t<Args>...>;
 
 		AsyncTask(const base_type&) = delete;
 
@@ -153,7 +153,7 @@ namespace s3d
 		base_type m_data;
 	};
 
-	template <class Fty, class... Args> requires std::invocable<Fty, Args...>
+	template <class Fty, class... Args> requires std::invocable<std::decay_t<Fty>, std::decay_t<Args>...>
 	AsyncTask(Fty, Args...) -> AsyncTask<std::invoke_result_t<std::decay_t<Fty>, std::decay_t<Args>...>>;
 
 	////////////////////////////////////////////////////////////////
@@ -170,7 +170,7 @@ namespace s3d
 	/// @remark 作成と同時にタスクが非同期で実行されます。
 	/// @remark 参照を渡す場合は `std::ref()` を使ってください。
 	/// @return 作成された非同期処理のタスク
-	template <class Fty, class... Args> requires std::invocable<Fty, Args...>
+	template <class Fty, class... Args> requires std::invocable<std::decay_t<Fty>, std::decay_t<Args>...>
 	[[nodiscard]]
 	auto Async(Fty&& f, Args&&... args);
 }

diff --git a/Siv3D/include/Siv3D/detail/AsyncTask.ipp b/Siv3D/include/Siv3D/detail/AsyncTask.ipp
@@ -29,7 +29,7 @@ namespace s3d
 
 	template <class Type>
 	template <class Fty, class... Args>
-	AsyncTask<Type>::AsyncTask(Fty&& f, Args&&... args) requires std::invocable<Fty, Args...>
+	AsyncTask<Type>::AsyncTask(Fty&& f, Args&&... args) requires std::invocable<std::decay_t<Fty>, std::decay_t<Args>...>
 # if !SIV3D_PLATFORM(WEB) || defined(__EMSCRIPTEN_PTHREADS__)
 		: m_data{ std::async(std::launch::async, std::forward<Fty>(f), std::forward<Args>(args)...) } {}
 # else
@@ -148,7 +148,7 @@ namespace s3d
 	//
 	////////////////////////////////////////////////////////////////
 
-	template <class Fty, class... Args> requires std::invocable<Fty, Args...>
+	template <class Fty, class... Args> requires std::invocable<std::decay_t<Fty>, std::decay_t<Args>...>
 	auto Async(Fty&& f, Args&&... args)
 	{
 		return AsyncTask<std::invoke_result_t<std::decay_t<Fty>, std::decay_t<Args>...>>{ std::forward<Fty>(f), std::forward<Args>(args)... };