Skip to content

Make dtor of Trackable and Trackable2D non default #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
granger35 merged 2 commits into from
Mar 2, 2022
Merged

Make dtor of Trackable and Trackable2D non default #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
263bcc9
Make dtor of Trackable and Trackable2D non default
jim-bcom Feb 25, 2022
d4672f4
Use user-defined default impl for dtor of Trackable/Trackable2D
jim-bcom Mar 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions interfaces/datastructure/Trackable.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions interfaces/datastructure/Trackable2D.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 2 additions & 0 deletions src/datastructure/Trackable.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
3 changes: 3 additions & 0 deletions src/datastructure/Trackable2D.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@ Trackable2D::Trackable2D(const std::string & url,
m_size.height = height;
}

// destructor
Trackable2D::~Trackable2D() = default;

// Class methods

Sizef Trackable2D::getSize() const {
Expand Down