mirrors/SFML
1
0
Fork 0
mirror of https://github.com/SFML/SFML.git synced 2024-11-24 20:31:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Disallow construction from const T&&

Browse Source
This commit is contained in:
Chris Thrasher 2024-06-23 15:38:16 -06:00
parent 86c1a71a93
commit 14cff7406f
7 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/SFML/Audio/Sound.hpp
View File

@ -59,7 +59,7 @@ public:
/// \brief Disallow construction from a temporary sound buffer
///
////////////////////////////////////////////////////////////
explicit Sound(SoundBuffer&& buffer) = delete;
explicit Sound(const SoundBuffer&& buffer) = delete;
////////////////////////////////////////////////////////////
/// \brief Copy constructor
@ -130,7 +130,7 @@ public:
/// \brief Disallow setting from a temporary sound buffer
///
////////////////////////////////////////////////////////////
void setBuffer(SoundBuffer&& buffer) = delete;
void setBuffer(const SoundBuffer&& buffer) = delete;
////////////////////////////////////////////////////////////
/// \brief Set whether or not the sound should loop after reaching the end

2
include/SFML/Graphics/Shader.hpp
View File

@ -493,7 +493,7 @@ public:
/// \brief Disallow setting from a temporary texture
///
////////////////////////////////////////////////////////////
void setUniform(const std::string& name, Texture&& texture) = delete;
void setUniform(const std::string& name, const Texture&& texture) = delete;
////////////////////////////////////////////////////////////
/// \brief Specify current texture as \p sampler2D uniform

6
include/SFML/Graphics/Sprite.hpp
View File

@ -64,7 +64,7 @@ public:
/// \brief Disallow construction from a temporary texture
///
////////////////////////////////////////////////////////////
explicit Sprite(Texture&& texture) = delete;
explicit Sprite(const Texture&& texture) = delete;
////////////////////////////////////////////////////////////
/// \brief Construct the sprite from a sub-rectangle of a source texture
@ -81,7 +81,7 @@ public:
/// \brief Disallow construction from a temporary texture
///
////////////////////////////////////////////////////////////
Sprite(Texture&& texture, const IntRect& rectangle) = delete;
Sprite(const Texture&& texture, const IntRect& rectangle) = delete;
////////////////////////////////////////////////////////////
/// \brief Change the source texture of the sprite
@ -108,7 +108,7 @@ public:
/// \brief Disallow setting from a temporary texture
///
////////////////////////////////////////////////////////////
void setTexture(Texture&& texture, bool resetRect = false) = delete;
void setTexture(const Texture&& texture, bool resetRect = false) = delete;
////////////////////////////////////////////////////////////
/// \brief Set the sub-rectangle of the texture that the sprite will display

4
include/SFML/Graphics/Text.hpp
View File

@ -90,7 +90,7 @@ public:
/// \brief Disallow construction from a temporary font
///
////////////////////////////////////////////////////////////
Text(Font&& font, String string = "", unsigned int characterSize = 30) = delete;
Text(const Font&& font, String string = "", unsigned int characterSize = 30) = delete;
////////////////////////////////////////////////////////////
/// \brief Set the text's string
@ -134,7 +134,7 @@ public:
/// \brief Disallow setting from a temporary font
///
////////////////////////////////////////////////////////////
void setFont(Font&& font) = delete;
void setFont(const Font&& font) = delete;
////////////////////////////////////////////////////////////
/// \brief Set the character size

1
test/Audio/Sound.test.cpp
View File

@ -16,6 +16,7 @@ TEST_CASE("[Audio] sf::Sound", runAudioDeviceTests())
SECTION("Type traits")
{
STATIC_CHECK(!std::is_constructible_v<sf::Sound, sf::SoundBuffer&&>);
STATIC_CHECK(!std::is_constructible_v<sf::Sound, const sf::SoundBuffer&&>);
STATIC_CHECK(std::is_copy_constructible_v<sf::Sound>);
STATIC_CHECK(std::is_copy_assignable_v<sf::Sound>);
STATIC_CHECK(std::is_move_constructible_v<sf::Sound>);

3
test/Graphics/Sprite.test.cpp
View File

@ -13,6 +13,9 @@ TEST_CASE("[Graphics] sf::Sprite", runDisplayTests())
SECTION("Type traits")
{
STATIC_CHECK(!std::is_constructible_v<sf::Sprite, sf::Texture&&>);
STATIC_CHECK(!std::is_constructible_v<sf::Sprite, const sf::Texture&&>);
STATIC_CHECK(!std::is_constructible_v<sf::Sprite, sf::Texture&&, const sf::IntRect&>);
STATIC_CHECK(!std::is_constructible_v<sf::Sprite, const sf::Texture&&, const sf::IntRect&>);
STATIC_CHECK(std::is_copy_constructible_v<sf::Sprite>);
STATIC_CHECK(std::is_copy_assignable_v<sf::Sprite>);
STATIC_CHECK(std::is_nothrow_move_constructible_v<sf::Sprite>);

1
test/Graphics/Text.test.cpp
View File

@ -14,6 +14,7 @@ TEST_CASE("[Graphics] sf::Text", runDisplayTests())
SECTION("Type traits")
{
STATIC_CHECK(!std::is_constructible_v<sf::Text, sf::Font&&, sf::String, unsigned int>);
STATIC_CHECK(!std::is_constructible_v<sf::Text, const sf::Font&&, sf::String, unsigned int>);
STATIC_CHECK(std::is_copy_constructible_v<sf::Text>);
STATIC_CHECK(std::is_copy_assignable_v<sf::Text>);
STATIC_CHECK(std::is_nothrow_move_constructible_v<sf::Text>);