Merge "Clean up the code to build successfully on macOS" into devel/master

[platform/core/uifw/dali-core.git] / dali / internal / update / common / scene-graph-connection-change-propagator.h

diff --git a/dali/internal/update/common/scene-graph-connection-change-propagator.h b/dali/internal/update/common/scene-graph-connection-change-propagator.h
index 65e49fc..3621541 100644 (file)
--- a/dali/internal/update/common/scene-graph-connection-change-propagator.h
+++ b/dali/internal/update/common/scene-graph-connection-change-propagator.h
@@ -53,6 +53,13 @@ public:
      * Inform the observer of the object that the object is about to be destroyed
      */
     virtual void ObservedObjectDestroyed(PropertyOwner& object){}
+
+  protected:
+
+    /**
+     * Virtual destructor, no deletion through this interface
+     */
+    virtual ~Observer() = default;
   };
 
   /**
@@ -94,8 +101,8 @@ public:
   void Destroy( PropertyOwner& object );
 
 private:
-  typedef Dali::Vector<Observer*> Observers;
-  typedef Observers::Iterator ObserversIterator;
+  using Observers         = Dali::Vector<Observer*>;
+  using ObserversIterator = Observers::Iterator;
 
   Observers mObservers;
 };