Revert "test"

This reverts commit 5ef6154afab59f887a4765d4a259f861ff13ffc4.
This commit is contained in:
Denis Blank 2015-06-10 01:57:49 +02:00 committed by Naios
parent 90e92f4808
commit 8718c5fad9
2 changed files with 10 additions and 11 deletions

View File

@ -24,21 +24,21 @@
#include "functional_unwrap.hpp" #include "functional_unwrap.hpp"
template<class... Args> template<typename... Args>
using Callback = std::function<void(Args...)>; using Callback = std::function<void(Args...)>;
template<class... Args> template<typename... Args>
using SharedCallback = std::shared_ptr<Callback<Args...>>; using SharedCallback = std::shared_ptr<Callback<Args...>>;
template<class... Args> template<typename... Args>
using WeakCallback = std::weak_ptr<Callback<Args...>>; using WeakCallback = std::weak_ptr<Callback<Args...>>;
namespace detail namespace detail
{ {
template<class... Args> template<typename... Args>
struct do_unwrap_callback; struct do_unwrap_callback;
template<class... Args> template<typename... Args>
struct do_unwrap_callback<std::tuple<Args...>> struct do_unwrap_callback<std::tuple<Args...>>
{ {
typedef Callback<Args...> CallbackType; typedef Callback<Args...> CallbackType;
@ -48,21 +48,21 @@ namespace detail
typedef WeakCallback<Args...> WeakCallbackType; typedef WeakCallback<Args...> WeakCallbackType;
}; };
template<class _CTy> template<typename _CTy>
using unwrap_callback = do_unwrap_callback<::fu::argument_type_of_t<_CTy>>; using unwrap_callback = do_unwrap_callback<::fu::argument_type_of_t<_CTy>>;
} // detail } // detail
template<class _CTy> template<typename _CTy>
using callback_of_t = typename detail::unwrap_callback<_CTy>::CallbackType; using callback_of_t = typename detail::unwrap_callback<_CTy>::CallbackType;
template<class _CTy> template<typename _CTy>
using shared_callback_of_t = typename detail::unwrap_callback<_CTy>::SharedCallbackType; using shared_callback_of_t = typename detail::unwrap_callback<_CTy>::SharedCallbackType;
template<class _CTy> template<typename _CTy>
using weak_callback_of_t = typename detail::unwrap_callback<_CTy>::WeakCallbackType; using weak_callback_of_t = typename detail::unwrap_callback<_CTy>::WeakCallbackType;
template<class _CTy> template<typename _CTy>
inline typename shared_callback_of_t<_CTy> inline typename shared_callback_of_t<_CTy>
make_shared_callback(_CTy&& callback) make_shared_callback(_CTy&& callback)
{ {

View File

@ -6,7 +6,6 @@
#include <iostream> #include <iostream>
#include <exception> #include <exception>
#include <type_traits>
void CastSpell(int id, Callback<bool> const& callback) void CastSpell(int id, Callback<bool> const& callback)
{ {