From 11b82bbb38815df31e5f4b8e861bb82648bf2cff Mon Sep 17 00:00:00 2001 From: Elliott Mahler Date: Fri, 11 Mar 2022 12:55:51 -0800 Subject: [PATCH 1/4] Fix compile error on clang - template param 'tRet' shadowed another tRet --- .../Source/SquidTasks/Public/SquidTasks/Private/TaskPrivate.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/unreal/Plugins/SquidTasks/Source/SquidTasks/Public/SquidTasks/Private/TaskPrivate.h b/unreal/Plugins/SquidTasks/Source/SquidTasks/Public/SquidTasks/Private/TaskPrivate.h index c49c365..7bcf7d6 100644 --- a/unreal/Plugins/SquidTasks/Source/SquidTasks/Public/SquidTasks/Private/TaskPrivate.h +++ b/unreal/Plugins/SquidTasks/Source/SquidTasks/Public/SquidTasks/Private/TaskPrivate.h @@ -107,7 +107,7 @@ struct AddStopTaskAwaiter } private: - template friend class TaskPromiseBase; + template friend class TaskPromiseBase; Task* m_taskToStop = nullptr; }; @@ -127,7 +127,7 @@ struct RemoveStopTaskAwaiter } private: - template friend class TaskPromiseBase; + template friend class TaskPromiseBase; Task* m_taskToStop = nullptr; }; From e8fe536e6b0fb72040f2be3e168c516d6543cc88 Mon Sep 17 00:00:00 2001 From: Elliott Mahler Date: Fri, 11 Mar 2022 12:56:40 -0800 Subject: [PATCH 2/4] Fix compile error on clang - template param 'tRet' shadowed another tRet --- include/Private/TaskPrivate.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/Private/TaskPrivate.h b/include/Private/TaskPrivate.h index 37f5262..ec578ed 100644 --- a/include/Private/TaskPrivate.h +++ b/include/Private/TaskPrivate.h @@ -106,7 +106,7 @@ struct AddStopTaskAwaiter } private: - template friend class TaskPromiseBase; + template friend class TaskPromiseBase; Task* m_taskToStop = nullptr; }; @@ -126,7 +126,7 @@ struct RemoveStopTaskAwaiter } private: - template friend class TaskPromiseBase; + template friend class TaskPromiseBase; Task* m_taskToStop = nullptr; }; From ff6a9e8fd352951711b900c3ce9c3d853f441a2a Mon Sep 17 00:00:00 2001 From: Elliott Mahler Date: Fri, 11 Mar 2022 13:22:24 -0800 Subject: [PATCH 3/4] 2 more shadowing fixes --- .../SquidTasks/Public/SquidTasks/Private/TaskPrivate.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/unreal/Plugins/SquidTasks/Source/SquidTasks/Public/SquidTasks/Private/TaskPrivate.h b/unreal/Plugins/SquidTasks/Source/SquidTasks/Public/SquidTasks/Private/TaskPrivate.h index 7bcf7d6..6897535 100644 --- a/unreal/Plugins/SquidTasks/Source/SquidTasks/Public/SquidTasks/Private/TaskPrivate.h +++ b/unreal/Plugins/SquidTasks/Source/SquidTasks/Public/SquidTasks/Private/TaskPrivate.h @@ -418,15 +418,15 @@ public: } #endif //SQUID_ENABLE_TASK_DEBUG - template - auto await_transform(AddStopTaskAwaiter in_awaiter) + template + auto await_transform(AddStopTaskAwaiter in_awaiter) { m_taskInternal->AddStopTask(*in_awaiter.m_taskToStop); return std::suspend_never(); } - template - auto await_transform(RemoveStopTaskAwaiter in_awaiter) + template + auto await_transform(RemoveStopTaskAwaiter in_awaiter) { m_taskInternal->RemoveStopTask(*in_awaiter.m_taskToStop); return std::suspend_never(); From ecceb348ec3bca136899cbe48d97f1a0422495f6 Mon Sep 17 00:00:00 2001 From: Elliott Mahler Date: Fri, 11 Mar 2022 13:23:02 -0800 Subject: [PATCH 4/4] 2 more shadowing fixes --- include/Private/TaskPrivate.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/Private/TaskPrivate.h b/include/Private/TaskPrivate.h index ec578ed..34e8494 100644 --- a/include/Private/TaskPrivate.h +++ b/include/Private/TaskPrivate.h @@ -403,15 +403,15 @@ public: } #endif //SQUID_ENABLE_TASK_DEBUG - template - auto await_transform(AddStopTaskAwaiter in_awaiter) + template + auto await_transform(AddStopTaskAwaiter in_awaiter) { m_taskInternal->AddStopTask(*in_awaiter.m_taskToStop); return std::suspend_never(); } - template - auto await_transform(RemoveStopTaskAwaiter in_awaiter) + template + auto await_transform(RemoveStopTaskAwaiter in_awaiter) { m_taskInternal->RemoveStopTask(*in_awaiter.m_taskToStop); return std::suspend_never();