coffee/continuable
1
0
Fork 0
mirror of https://github.com/Naios/continuable.git synced 2025-12-09 18:26:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

correct perfect forwarding on various places

Browse Source
This commit is contained in:
Denis Blank 2015-06-11 14:51:32 +02:00 committed by Naios
parent 2955e21965
commit b923fc3e2f
2 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
fluent/Callback.h
View File

@ -22,6 +22,7 @@
#include <functional>
#include <utility>
#include <memory>
#include <type_traits>
#include "functional_unwrap.hpp"
@ -53,31 +54,31 @@ namespace detail
};
template<typename _CTy>
using unwrap_callback_t = do_unwrap_callback<::fu::function_type_of_t<_CTy>>;
using unwrap_callback_t = do_unwrap_callback<::fu::function_type_of_t<typename std::decay<_CTy>::type>>;
template<typename... Args>
template<typename _CTy, typename... Args>
struct WeakProxyFactory;
template<typename... Args>
struct WeakProxyFactory<std::weak_ptr<std::function<void(Args...)>>>
template<typename _CTy, typename... Args>
struct WeakProxyFactory<_CTy, std::weak_ptr<std::function<void(Args...)>>>
{
static Callback<Args...> CreateProxy(WeakCallback<Args...> const& weak)
static Callback<Args...> CreateProxy(_CTy&& weak)
{
return [=](Args&&... args)
{
if (auto const callback = weak.lock())
// FIXME: use std::forward
(*callback)(args...);
(*callback)(std::forward<Args>(args)...);
};
}
};
template<typename... Args>
struct WeakProxyFactory<std::shared_ptr<std::function<void(Args...)>>>
template<typename _CTy, typename... Args>
struct WeakProxyFactory<_CTy, std::shared_ptr<std::function<void(Args...)>>>
{
static Callback<Args...> CreateProxy(SharedCallback<Args...> const& shared)
static Callback<Args...> CreateProxy(_CTy&& shared)
{
return WeakProxyFactory<std::weak_ptr<std::function<void(Args...)>>>::CreateProxy(shared);
return WeakProxyFactory<std::weak_ptr<std::function<void(Args...)>>&&,
std::weak_ptr<std::function<void(Args...)>>>::CreateProxy(std::forward<_CTy>(shared));
}
};
@ -107,10 +108,12 @@ inline auto make_shared_callback(_CTy&& callback)
/// Creates a weak callback which wraps the given shared or weak callback.
/// If the given managed callback expires the callback is not invoked anymore.
template<typename _CTy>
inline auto make_weak_wrapped_callback(_CTy const& callback)
-> decltype(detail::WeakProxyFactory<_CTy>::CreateProxy(std::declval<_CTy>()))
inline auto make_weak_wrapped_callback(_CTy&& callback)
-> decltype(detail::WeakProxyFactory<_CTy, std::decay<_CTy>::type>::
CreateProxy(std::declval<_CTy>()))
{
return detail::WeakProxyFactory<_CTy>::CreateProxy(callback);
return detail::WeakProxyFactory<_CTy, std::decay<_CTy>::type>::
CreateProxy(std::forward<_CTy>(callback));
}
#endif // _CALLBACK_H_

2
fluent/WeakCallbackContainer.h
View File

@ -54,7 +54,7 @@ class WeakCallbackContainer
if (auto const callback = weak_callback.lock())
{
// Invoke the original callback
(*callback)(args...); // FIXME: use std::forward
(*callback)(std::forward<Args>(args)...);
// Unregister the callback
owner->InvalidateCallback(handle);