From 21191edab0fa696b4b89b758e90ba40f1173cbea Mon Sep 17 00:00:00 2001 From: Kimmo Hoikka Date: Tue, 16 Dec 2014 19:33:56 +0000 Subject: [PATCH] remove 58k unnecessary asserts from dali-demo startup Change-Id: If9713cdc76dcc60cb2d63104e98b61afb8c0e05e --- dali/public-api/object/base-handle.cpp | 4 ---- dali/public-api/object/base-handle.h | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dali/public-api/object/base-handle.cpp b/dali/public-api/object/base-handle.cpp index 45473a3..9347aa8 100644 --- a/dali/public-api/object/base-handle.cpp +++ b/dali/public-api/object/base-handle.cpp @@ -74,15 +74,11 @@ bool BaseHandle::GetTypeInfo(Dali::TypeInfo& typeInfo) const BaseObject& BaseHandle::GetBaseObject() { - DALI_ASSERT_ALWAYS( mObjectHandle.Get() && "BaseHandle is empty" ); - return static_cast(*mObjectHandle); } const BaseObject& BaseHandle::GetBaseObject() const { - DALI_ASSERT_ALWAYS(mObjectHandle.Get() && "BaseHandle is empty" ); - return static_cast(*mObjectHandle); } diff --git a/dali/public-api/object/base-handle.h b/dali/public-api/object/base-handle.h index 77bd59e..e726bcd 100644 --- a/dali/public-api/object/base-handle.h +++ b/dali/public-api/object/base-handle.h @@ -149,7 +149,7 @@ public: * @brief Retrieve the internal Dali resource. * * This is useful for checking the reference count of the internal resource. - * This method will assert, if the Dali::BaseHandle has not been initialized. + * This method will not check the validity of the handle so the caller is expected to check it by using if (handle) * @return The BaseObject which is referenced by the BaseHandle. */ BaseObject& GetBaseObject(); @@ -158,7 +158,7 @@ public: * @brief Retrieve the internal Dali resource. * * This is useful for checking the reference count of the internal resource. - * This method will assert, if the Dali::BaseHandle has not been initialized. + * This method will not check the validity of the handle so the caller is expected to check it by using if (handle) * @return The BaseObject which is referenced by the BaseHandle. */ const BaseObject& GetBaseObject() const; -- 2.7.4