From 8718c5fad95dc596604ac621c96741d10f4c86bb Mon Sep 17 00:00:00 2001 From: Denis Blank Date: Wed, 10 Jun 2015 01:57:49 +0200 Subject: [PATCH] Revert "test" This reverts commit 5ef6154afab59f887a4765d4a259f861ff13ffc4. --- fluent++/Callback.h | 20 ++++++++++---------- test.cpp | 1 - 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/fluent++/Callback.h b/fluent++/Callback.h index 720a2c2..84e8bb8 100644 --- a/fluent++/Callback.h +++ b/fluent++/Callback.h @@ -24,21 +24,21 @@ #include "functional_unwrap.hpp" -template +template using Callback = std::function; -template +template using SharedCallback = std::shared_ptr>; -template +template using WeakCallback = std::weak_ptr>; namespace detail { - template + template struct do_unwrap_callback; - template + template struct do_unwrap_callback> { typedef Callback CallbackType; @@ -48,21 +48,21 @@ namespace detail typedef WeakCallback WeakCallbackType; }; - template + template using unwrap_callback = do_unwrap_callback<::fu::argument_type_of_t<_CTy>>; } // detail -template +template using callback_of_t = typename detail::unwrap_callback<_CTy>::CallbackType; -template +template using shared_callback_of_t = typename detail::unwrap_callback<_CTy>::SharedCallbackType; -template +template using weak_callback_of_t = typename detail::unwrap_callback<_CTy>::WeakCallbackType; -template +template inline typename shared_callback_of_t<_CTy> make_shared_callback(_CTy&& callback) { diff --git a/test.cpp b/test.cpp index 25aece8..e984b9c 100644 --- a/test.cpp +++ b/test.cpp @@ -6,7 +6,6 @@ #include #include -#include void CastSpell(int id, Callback const& callback) {