Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=f294a59b4092511d5ed2caac51bee37fd95f42dc
commit f294a59b4092511d5ed2caac51bee37fd95f42dc Author: Michel Hermier <[email protected]> Date: Sun Oct 19 11:45:49 2014 +0200 libpacman: make FFunction and FSignal less dependent to ASSERT. diff --git a/lib/libpacman/kernel/fsignal.h b/lib/libpacman/kernel/fsignal.h index af82569..933de6c 100644 --- a/lib/libpacman/kernel/fsignal.h +++ b/lib/libpacman/kernel/fsignal.h @@ -70,10 +70,11 @@ public: bool connect(const flib::FFunction<R(Args...)>& function) { - ASSERT(function, return false); - - m_connections.push_back(function); - return true; + if(function) { + m_connections.push_back(function); + return true; + } + return false; } template <typename OtherR, typename... OtherArgs> diff --git a/lib/libpacman/util/ffunctional.h b/lib/libpacman/util/ffunctional.h index 4527447..fd9db4a 100644 --- a/lib/libpacman/util/ffunctional.h +++ b/lib/libpacman/util/ffunctional.h @@ -27,8 +27,6 @@ #include "util/ftype_traits.h" -#include "util.h" // For ASSERT - namespace flib { @@ -307,10 +305,9 @@ class FFunction<R(Args...)> template <typename Pointer, typename MethodSignature, typename Target, typename VirtualSignature> void _connect(Pointer pointer, MethodSignature method) { - ASSERT(pointer != nullptr, return;); - ASSERT(method != nullptr, return;); - - d = shared_ptr(new flib::detail::FMethodImpl<R(Args...), MethodSignature, Target, Pointer, VirtualSignature>(pointer, method)); + if(pointer != nullptr && method != nullptr) { + d = shared_ptr(new flib::detail::FMethodImpl<R(Args...), MethodSignature, Target, Pointer, VirtualSignature>(pointer, method)); + } } public: @@ -328,17 +325,17 @@ public: template <typename FunctionR, typename... FunctionArgs> FFunction(FunctionR (*function)(FunctionArgs...)) { - ASSERT(function != nullptr, return;); - - d = shared_ptr(new flib::detail::FFunctionImpl<R(Args...), FunctionR (*)(FunctionArgs...), FunctionR(FunctionArgs...)>(function)); + if(function != nullptr) { + d = shared_ptr(new flib::detail::FFunctionImpl<R(Args...), FunctionR (*)(FunctionArgs...), FunctionR(FunctionArgs...)>(function)); + } } template <typename CallbackR, typename CallbackData, typename... CallbackArgs, typename CallbackDataHolder> FFunction(CallbackR (*callback)(CallbackData, CallbackArgs...), CallbackDataHolder data) { - ASSERT(callback != nullptr, return;); - - d = shared_ptr(new flib::detail::FCallbackImpl<R(Args...), CallbackR (*)(CallbackData, CallbackArgs...), CallbackR(CallbackData, CallbackArgs...), CallbackDataHolder>(callback, data)); + if(callback != nullptr) { + d = shared_ptr(new flib::detail::FCallbackImpl<R(Args...), CallbackR (*)(CallbackData, CallbackArgs...), CallbackR(CallbackData, CallbackArgs...), CallbackDataHolder>(callback, data)); + } } template <typename Pointer, typename MethodSignature> _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
