some minor improvements

This commit is contained in:
Denis Blank 2015-06-10 03:11:41 +02:00 committed by Naios
parent a0562ca170
commit 43dd5509b0
2 changed files with 8 additions and 5 deletions

View File

@ -84,17 +84,17 @@ inline shared_callback_of_t<_CTy>
}
template<typename... Args>
inline auto make_weak_wrapped_callback(WeakCallback<Args...> const& wrapped_callback)
inline auto make_weak_wrapped_callback(WeakCallback<Args...> const& weak_callback)
-> Callback<Args...>
{
return detail::WeakProxyFactory<Args...>::CreateProxy(wrapped_callback);
return detail::WeakProxyFactory<Args...>::CreateProxy(weak_callback);
}
template<typename... Args>
inline auto make_weak_wrapped_callback(SharedCallback<Args...> const& wrapped_callback)
inline auto make_weak_wrapped_callback(SharedCallback<Args...> const& shared_callback)
-> Callback<Args...>
{
return make_weak_wrapped_callback<Args...>(WeakCallback<Args...>(wrapped_callback));
return make_weak_wrapped_callback<Args...>(WeakCallback<Args...>(shared_callback));
}
#endif /// _CALLBACK_H_

View File

@ -94,11 +94,14 @@ int main(int argc, char** argv)
auto weak_2 = make_shared_callback([]
{
std::cout << "huhu" << std::endl;
});
auto wrapped = make_weak_wrapped_callback(weak_2);
auto wrapped2 = make_weak_wrapped_callback(WeakCallback<>(weak_2));
wrapped();
wrapped2();
return 0;
}