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:
Mat M 2019-10-19 17:47:40 -04:00 committed by GitHub
commit ef77101463
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions

View File

@ -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);

View File

@ -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!