mewin/SquidTasks
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1 from ejmahler/main

Browse Source 
Fix compile error on clang - template param 'tRet' shadowed another tRet
This commit is contained in:
Tim Ambrogi Saxon 2022-03-14 12:51:58 -04:00 committed by GitHub
commit 15e67a5bec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/Private/TaskPrivate.h
View File

@ -106,7 +106,7 @@ struct AddStopTaskAwaiter
} }
private: private:
template <typename tRet> friend class TaskPromiseBase; template <typename tOtherRet> friend class TaskPromiseBase;
Task<tRet, RefType, Resumable>* m_taskToStop = nullptr; Task<tRet, RefType, Resumable>* m_taskToStop = nullptr;
}; };
@ -126,7 +126,7 @@ struct RemoveStopTaskAwaiter
} }
private: private:
template <typename tRet> friend class TaskPromiseBase; template <typename tOtherRet> friend class TaskPromiseBase;
Task<tRet, RefType, Resumable>* m_taskToStop = nullptr; Task<tRet, RefType, Resumable>* m_taskToStop = nullptr;
}; };
@ -403,15 +403,15 @@ public:
} }
#endif //SQUID_ENABLE_TASK_DEBUG #endif //SQUID_ENABLE_TASK_DEBUG
template <typename tRet, eTaskRef RefType, eTaskResumable Resumable> template <typename tInnerRet, eTaskRef RefType, eTaskResumable Resumable>
auto await_transform(AddStopTaskAwaiter<tRet, RefType, Resumable> in_awaiter) auto await_transform(AddStopTaskAwaiter<tInnerRet, RefType, Resumable> in_awaiter)
{ {
m_taskInternal->AddStopTask(*in_awaiter.m_taskToStop); m_taskInternal->AddStopTask(*in_awaiter.m_taskToStop);
return std::suspend_never(); return std::suspend_never();
} }
template <typename tRet, eTaskRef RefType, eTaskResumable Resumable> template <typename tInnerRet, eTaskRef RefType, eTaskResumable Resumable>
auto await_transform(RemoveStopTaskAwaiter<tRet, RefType, Resumable> in_awaiter) auto await_transform(RemoveStopTaskAwaiter<tInnerRet, RefType, Resumable> in_awaiter)
{ {
m_taskInternal->RemoveStopTask(*in_awaiter.m_taskToStop); m_taskInternal->RemoveStopTask(*in_awaiter.m_taskToStop);
return std::suspend_never(); return std::suspend_never();

12
unreal/Plugins/SquidTasks/Source/SquidTasks/Public/SquidTasks/Private/TaskPrivate.h
View File

@ -107,7 +107,7 @@ struct AddStopTaskAwaiter
} }
private: private:
template <typename tRet> friend class TaskPromiseBase; template <typename tOtherRet> friend class TaskPromiseBase;
Task<tRet, RefType, Resumable>* m_taskToStop = nullptr; Task<tRet, RefType, Resumable>* m_taskToStop = nullptr;
}; };
@ -127,7 +127,7 @@ struct RemoveStopTaskAwaiter
} }
private: private:
template <typename tRet> friend class TaskPromiseBase; template <typename tOtherRet> friend class TaskPromiseBase;
Task<tRet, RefType, Resumable>* m_taskToStop = nullptr; Task<tRet, RefType, Resumable>* m_taskToStop = nullptr;
}; };
@ -418,15 +418,15 @@ public:
} }
#endif //SQUID_ENABLE_TASK_DEBUG #endif //SQUID_ENABLE_TASK_DEBUG
template <typename tRet, eTaskRef RefType, eTaskResumable Resumable> template <typename tInnerRet, eTaskRef RefType, eTaskResumable Resumable>
auto await_transform(AddStopTaskAwaiter<tRet, RefType, Resumable> in_awaiter) auto await_transform(AddStopTaskAwaiter<tInnerRet, RefType, Resumable> in_awaiter)
{ {
m_taskInternal->AddStopTask(*in_awaiter.m_taskToStop); m_taskInternal->AddStopTask(*in_awaiter.m_taskToStop);
return std::suspend_never(); return std::suspend_never();
} }
template <typename tRet, eTaskRef RefType, eTaskResumable Resumable> template <typename tInnerRet, eTaskRef RefType, eTaskResumable Resumable>
auto await_transform(RemoveStopTaskAwaiter<tRet, RefType, Resumable> in_awaiter) auto await_transform(RemoveStopTaskAwaiter<tInnerRet, RefType, Resumable> in_awaiter)
{ {
m_taskInternal->RemoveStopTask(*in_awaiter.m_taskToStop); m_taskInternal->RemoveStopTask(*in_awaiter.m_taskToStop);
return std::suspend_never(); return std::suspend_never();