Skip to content
Permalink
Browse files

Merge pull request #8412 from jordan-woyak/def-warn-fix

Core/HW: Fix some explicitly defaulted but implicitly deleted warnings.
  • Loading branch information...
lioncash committed Oct 19, 2019
2 parents f6a5811 + 9e8181e commit ef77101463de60be9c5cdedb2c5d5a0f4168b8b5
@@ -26,8 +26,8 @@ class GCMemcardDirectory : public MemoryCardBase

GCMemcardDirectory(const GCMemcardDirectory&) = delete;
GCMemcardDirectory& operator=(const GCMemcardDirectory&) = delete;
GCMemcardDirectory(GCMemcardDirectory&&) = default;
GCMemcardDirectory& operator=(GCMemcardDirectory&&) = default;
GCMemcardDirectory(GCMemcardDirectory&&) = delete;
GCMemcardDirectory& operator=(GCMemcardDirectory&&) = delete;

static std::vector<std::string> GetFileNamesForGameID(const std::string& directory,
const std::string& game_id);
@@ -51,8 +51,8 @@ class Wiimote
public:
Wiimote(const Wiimote&) = delete;
Wiimote& operator=(const Wiimote&) = delete;
Wiimote(Wiimote&&) = default;
Wiimote& operator=(Wiimote&&) = default;
Wiimote(Wiimote&&) = delete;
Wiimote& operator=(Wiimote&&) = delete;

virtual ~Wiimote() {}
// This needs to be called in derived destructors!

0 comments on commit ef77101

Please sign in to comment.
You can’t perform that action at this time.