From a0bc89f89f60ab7262c9c6364bdf26d0b7e6056f Mon Sep 17 00:00:00 2001 From: "Jinho, Lee" Date: Tue, 30 May 2017 16:15:24 +0900 Subject: [PATCH] Revert "[Tizen] Avoid Svace MEMORY_LEAK warning in callback.cpp" This reverts commit 4a0606fa1a653af9a571c565669ae91dca8703d1. Change-Id: I150a390e63f56471ade1497483384f83544b8b4b --- dali/public-api/signals/callback.cpp | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/dali/public-api/signals/callback.cpp b/dali/public-api/signals/callback.cpp index 6bbf33f..841b1df 100644 --- a/dali/public-api/signals/callback.cpp +++ b/dali/public-api/signals/callback.cpp @@ -45,24 +45,18 @@ CallbackBase::CallbackBase( void* object, MemberFunction function, Dispatcher di : mMemberFunction( function ) { mImpl = new CallbackBase::Impl; - if( mImpl ) - { - mImpl->mObjectPointer = object; - mImpl->mMemberFunctionDispatcher = dispatcher; - mImpl->mDestructorDispatcher = NULL; // object is not owned - } + mImpl->mObjectPointer = object; + mImpl->mMemberFunctionDispatcher = dispatcher; + mImpl->mDestructorDispatcher = NULL; // object is not owned } CallbackBase::CallbackBase( void* object, MemberFunction function, Dispatcher dispatcher, Destructor destructor ) : mMemberFunction( function ) { mImpl = new CallbackBase::Impl; - if( mImpl ) - { - mImpl->mObjectPointer = object; - mImpl->mMemberFunctionDispatcher = dispatcher; - mImpl->mDestructorDispatcher = destructor; // object is owned - } + mImpl->mObjectPointer = object; + mImpl->mMemberFunctionDispatcher = dispatcher; + mImpl->mDestructorDispatcher = destructor; // object is owned } void CallbackBase::Reset() -- 2.7.4