F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

core: (fixes #949) fix bound callbacks arguments type detection

Browse Source
This commit is contained in:
Lauri Sormunen
2023-09-06 11:10:37 +02:00
committed by Tommaso Pecorella
parent c29c368038
commit ba88f48f1e
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/core/model/callback.h
View File

@@ -467,7 +467,8 @@ class Callback : public CallbackBase
auto f = cb.DoPeekImpl()->GetFunction();
CallbackComponentVector components(cb.DoPeekImpl()->GetComponents());
components.insert(components.end(), {std::make_shared<CallbackComponent<BArgs>>(bargs)...});
components.insert(components.end(),
{std::make_shared<CallbackComponent<std::decay_t<BArgs>>>(bargs)...});
m_impl = Create<CallbackImpl<R, UArgs...>>(
[f, bargs...](auto&&... uargs) -> R {
@@ -501,8 +502,9 @@ class Callback : public CallbackBase
constexpr bool isComp =
std::is_function_v<std::remove_pointer_t<T>> || std::is_member_pointer_v<T>;
CallbackComponentVector components({std::make_shared<CallbackComponent<T, isComp>>(func),
std::make_shared<CallbackComponent<BArgs>>(bargs)...});
CallbackComponentVector components(
{std::make_shared<CallbackComponent<T, isComp>>(func),
std::make_shared<CallbackComponent<std::decay_t<BArgs>>>(bargs)...});
m_impl = Create<CallbackImpl<R, UArgs...>>(
[f, bargs...](auto&&... uargs) -> R {
@@ -532,7 +534,7 @@ class Callback : public CallbackBase
CallbackComponentVector components(DoPeekImpl()->GetComponents());
components.insert(components.end(),
{std::make_shared<CallbackComponent<BoundArgs>>(bargs)...});
{std::make_shared<CallbackComponent<std::decay_t<BoundArgs>>>(bargs)...});
cb.m_impl = Create<std::remove_pointer_t<decltype(cb.DoPeekImpl())>>(
[f, bargs...](auto&&... uargs) mutable {