X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Fpublic-api%2Fobject%2Fany.cpp;h=8e8dfded9cf027d31681e0a0b7b97c1db38639bd;hb=7944cb8fe51a40dcecf48f08acf333f94be95414;hp=9930271de68ba04fcfa90ffb5810991b8e816ca5;hpb=5826321b721c2dc09abda23e9d845cb4cf8edc92;p=platform%2Fcore%2Fuifw%2Fdali-core.git diff --git a/dali/public-api/object/any.cpp b/dali/public-api/object/any.cpp index 9930271..8e8dfde 100644 --- a/dali/public-api/object/any.cpp +++ b/dali/public-api/object/any.cpp @@ -25,7 +25,7 @@ namespace Dali { Any::Any() -: mContainer( NULL ) +: mContainer( nullptr ) { } @@ -33,10 +33,10 @@ Any::~Any() { // Call the implementation deletion function, which will invalidate mContainer - if ( NULL != mContainer ) + if ( nullptr != mContainer ) { mContainer->mDeleteFunc( mContainer ); - mContainer = NULL; + mContainer = nullptr; } } @@ -44,16 +44,16 @@ Any& Any::operator=( const Any& any ) { if( &any != this ) { - if( NULL == any.mContainer ) + if( nullptr == any.mContainer ) { delete mContainer; - mContainer = NULL; + mContainer = nullptr; } else { AnyContainerBase* tmp = mContainer; - if( NULL != mContainer ) + if( nullptr != mContainer ) { // Check if two Any types have the same type. Avoids assignments of values with different types. if( mContainer->GetType() != any.GetType() )