mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-10 08:09:26 +01:00
Merge pull request #8412 from jordan-woyak/def-warn-fix
Core/HW: Fix some explicitly defaulted but implicitly deleted warnings.
This commit is contained in:
commit
ef77101463
@ -26,8 +26,8 @@ public:
|
|||||||
|
|
||||||
GCMemcardDirectory(const GCMemcardDirectory&) = delete;
|
GCMemcardDirectory(const GCMemcardDirectory&) = delete;
|
||||||
GCMemcardDirectory& operator=(const GCMemcardDirectory&) = delete;
|
GCMemcardDirectory& operator=(const GCMemcardDirectory&) = delete;
|
||||||
GCMemcardDirectory(GCMemcardDirectory&&) = default;
|
GCMemcardDirectory(GCMemcardDirectory&&) = delete;
|
||||||
GCMemcardDirectory& operator=(GCMemcardDirectory&&) = default;
|
GCMemcardDirectory& operator=(GCMemcardDirectory&&) = delete;
|
||||||
|
|
||||||
static std::vector<std::string> GetFileNamesForGameID(const std::string& directory,
|
static std::vector<std::string> GetFileNamesForGameID(const std::string& directory,
|
||||||
const std::string& game_id);
|
const std::string& game_id);
|
||||||
|
@ -51,8 +51,8 @@ class Wiimote
|
|||||||
public:
|
public:
|
||||||
Wiimote(const Wiimote&) = delete;
|
Wiimote(const Wiimote&) = delete;
|
||||||
Wiimote& operator=(const Wiimote&) = delete;
|
Wiimote& operator=(const Wiimote&) = delete;
|
||||||
Wiimote(Wiimote&&) = default;
|
Wiimote(Wiimote&&) = delete;
|
||||||
Wiimote& operator=(Wiimote&&) = default;
|
Wiimote& operator=(Wiimote&&) = delete;
|
||||||
|
|
||||||
virtual ~Wiimote() {}
|
virtual ~Wiimote() {}
|
||||||
// This needs to be called in derived destructors!
|
// This needs to be called in derived destructors!
|
||||||
|
Loading…
x
Reference in New Issue
Block a user