Merge pull request #49 from SolarFramework/fix/dynamic-cast-android

Make dtor of Trackable and Trackable2D non default
SolarFramework · Mar 2, 2022 · d6a1de6 · d6a1de6
2 parents 6b70416 + d4672f4
commit d6a1de6
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/interfaces/datastructure/Trackable.h b/interfaces/datastructure/Trackable.h
@@ -56,9 +56,9 @@ class SOLARFRAMEWORK_API Trackable
         Trackable(const std::string & url);
 
         ///
-        /// @brief Trackable default destructor
+        /// @brief Trackable destructor
         ///
-        virtual ~Trackable() = default;
+        virtual ~Trackable();
 
         ///
         /// @brief Returns the type of the Trackable object

diff --git a/interfaces/datastructure/Trackable2D.h b/interfaces/datastructure/Trackable2D.h
@@ -51,9 +51,9 @@ class SOLARFRAMEWORK_API Trackable2D : virtual public Trackable {
         Trackable2D(const std::string & url, const float & width, const float & height);
 
         ///
-        /// @brief Trackable2D default destructor
+        /// @brief Trackable2D destructor
         ///
-        virtual ~Trackable2D() = default;
+        virtual ~Trackable2D();
 
         // Class methods
 

diff --git a/src/datastructure/Trackable.cpp b/src/datastructure/Trackable.cpp
@@ -27,6 +27,8 @@ Trackable::Trackable(const std::string & url) : m_url(url) {
     LOG_DEBUG("Trackable constructor with url = {}", url);
 }
 
+Trackable::~Trackable() = default;
+
 std::string Trackable::getURL() const {
     return m_url;
 }

diff --git a/src/datastructure/Trackable2D.cpp b/src/datastructure/Trackable2D.cpp
@@ -39,6 +39,9 @@ Trackable2D::Trackable2D(const std::string & url,
     m_size.height = height;
 }
 
+// destructor
+Trackable2D::~Trackable2D() = default;
+
 // Class methods
 
 Sizef Trackable2D::getSize() const {