Merge pull request #2990 from lioncash/noncopy

Common: Alter semantics of the NonCopyable mixin
This commit is contained in:
Markus Wick 2015-09-08 11:08:58 +02:00
commit 81c07d4919
1 changed files with 5 additions and 5 deletions

View File

@ -60,12 +60,12 @@ extern const char *netplay_dolphin_ver;
class NonCopyable
{
protected:
NonCopyable() {}
NonCopyable(const NonCopyable&&) {}
void operator=(const NonCopyable&&) {}
constexpr NonCopyable() = default;
~NonCopyable() = default;
private:
NonCopyable(NonCopyable&);
NonCopyable& operator=(NonCopyable& other);
NonCopyable(NonCopyable&) = delete;
NonCopyable& operator=(NonCopyable&) = delete;
};
#if defined _WIN32