X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Fupdate%2Fnodes%2Fscene-graph-layer.h;h=26b217e8de98d1cc7288d4b6c127c3832377f9ba;hb=4d75040ab200bd306ec5a48f2a617480062eef4c;hp=e036df19b54dd0a95f9a5cbf1c19fb2dc71a46fd;hpb=9ac94c145f620fc90c39a0f3dadbd88cc4b01940;p=platform%2Fcore%2Fuifw%2Fdali-core.git diff --git a/dali/internal/update/nodes/scene-graph-layer.h b/dali/internal/update/nodes/scene-graph-layer.h old mode 100644 new mode 100755 index e036df1..26b217e --- a/dali/internal/update/nodes/scene-graph-layer.h +++ b/dali/internal/update/nodes/scene-graph-layer.h @@ -82,11 +82,6 @@ public: static SceneGraph::Layer* New(); /** - * Virtual destructor - */ - virtual ~Layer(); - - /** * From Node, to convert a node to a layer. * @return The layer. */ @@ -217,6 +212,11 @@ private: // Undefined Layer(const Layer&); + /** + * Virtual destructor + */ + virtual ~Layer(); + // Undefined Layer& operator=(const Layer& rhs); @@ -332,6 +332,16 @@ inline void SetDepthTestDisabledMessage( EventThreadServices& eventThreadService } // namespace SceneGraph +// Template specialisation for OwnerPointer, because delete is protected +template <> +inline void OwnerPointer::Reset() +{ + if (mObject != NULL) + { + Dali::Internal::SceneGraph::Node::Delete(mObject); + mObject = NULL; + } +} } // namespace Internal } // namespace Dali