From 43dd5509b0056911d33264cda9b5cd2032c793b0 Mon Sep 17 00:00:00 2001 From: Denis Blank Date: Wed, 10 Jun 2015 03:11:41 +0200 Subject: [PATCH] some minor improvements --- fluent++/Callback.h | 8 ++++---- test.cpp | 5 ++++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/fluent++/Callback.h b/fluent++/Callback.h index 7627498..09a4775 100644 --- a/fluent++/Callback.h +++ b/fluent++/Callback.h @@ -84,17 +84,17 @@ inline shared_callback_of_t<_CTy> } template -inline auto make_weak_wrapped_callback(WeakCallback const& wrapped_callback) +inline auto make_weak_wrapped_callback(WeakCallback const& weak_callback) -> Callback { - return detail::WeakProxyFactory::CreateProxy(wrapped_callback); + return detail::WeakProxyFactory::CreateProxy(weak_callback); } template -inline auto make_weak_wrapped_callback(SharedCallback const& wrapped_callback) +inline auto make_weak_wrapped_callback(SharedCallback const& shared_callback) -> Callback { - return make_weak_wrapped_callback(WeakCallback(wrapped_callback)); + return make_weak_wrapped_callback(WeakCallback(shared_callback)); } #endif /// _CALLBACK_H_ diff --git a/test.cpp b/test.cpp index 7ede5e1..9c3e43d 100644 --- a/test.cpp +++ b/test.cpp @@ -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; }