Skip to content
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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove defaulted or empty, non-virtual destructors #2312 #2321

Closed
wants to merge 3 commits into from
Closed

Remove defaulted or empty, non-virtual destructors #2312 #2321

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
355ff3a
Remove defaulted or empty, non-virtual destructors #2312
benjamintli Dec 27, 2022
bbfef5b
Add Font constructor back in
benjamintli Dec 28, 2022
dc8bec1
add shader destructor back in
benjamintli Dec 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 1 addition & 3 deletions examples/shader/Effect.hpp
View file
Open in desktop
Expand Up @@ -15,9 +15,7 @@
class Effect : public sf::Drawable
{
public:
~Effect() override
{
}
~Effect() override = default;

static void setFont(const sf::Font& font)
{
Expand Down
6 changes: 0 additions & 6 deletions include/SFML/Network/SocketSelector.hpp
View file
Open in desktop
Expand Up @@ -51,12 +51,6 @@ class SFML_NETWORK_API SocketSelector
////////////////////////////////////////////////////////////
SocketSelector();

////////////////////////////////////////////////////////////
/// \brief Destructor
///
////////////////////////////////////////////////////////////
~SocketSelector();

////////////////////////////////////////////////////////////
/// \brief Copy constructor
///
Expand Down
9 changes: 0 additions & 9 deletions include/SFML/Window/Cursor.hpp
View file
Open in desktop
Expand Up @@ -121,15 +121,6 @@ class SFML_WINDOW_API Cursor
////////////////////////////////////////////////////////////
Cursor();

////////////////////////////////////////////////////////////
/// \brief Destructor
///
/// This destructor releases the system resources
/// associated with this cursor, if any.
///
////////////////////////////////////////////////////////////
~Cursor();

////////////////////////////////////////////////////////////
/// \brief Deleted copy constructor
///
Expand Down
6 changes: 0 additions & 6 deletions src/SFML/Graphics/Shader.cpp
View file
Open in desktop
Expand Up @@ -989,12 +989,6 @@ Shader::CurrentTextureType Shader::CurrentTexture;
Shader::Shader() = default;


////////////////////////////////////////////////////////////
Shader::~Shader()
{
}
ChrisThrasher marked this conversation as resolved.
Show resolved Hide resolved


////////////////////////////////////////////////////////////
bool Shader::loadFromFile(const std::filesystem::path& /* filename */, Type /* type */)
{
Expand Down
4 changes: 0 additions & 4 deletions src/SFML/Network/SocketSelector.cpp
View file
Open in desktop
Expand Up @@ -65,10 +65,6 @@ SocketSelector::SocketSelector(const SocketSelector& copy) : m_impl(std::make_un
}


////////////////////////////////////////////////////////////
SocketSelector::~SocketSelector() = default;


////////////////////////////////////////////////////////////
void SocketSelector::add(Socket& socket)
{
Expand Down
4 changes: 0 additions & 4 deletions src/SFML/Window/Cursor.cpp
View file
Open in desktop
Expand Up @@ -40,10 +40,6 @@ Cursor::Cursor() : m_impl(std::make_unique<priv::CursorImpl>())
}


////////////////////////////////////////////////////////////
Cursor::~Cursor() = default;


////////////////////////////////////////////////////////////
bool Cursor::loadFromPixels(const std::uint8_t* pixels, Vector2u size, Vector2u hotspot)
{
Expand Down