diff options
| author |  bunnei | 2016-03-13 16:47:44 -0400 |
|---|---|---|
| committer | bunnei | 2016-03-13 16:47:44 -0400 |
| commit | a2024d749790f94979ad1f7a02363ab53f7de518 (patch) | |
| tree | a63c667d8972fe5d5a32d775b459b5873734a0cf | |
| parent | Merge pull request #1510 from wwylele/fix_pad (diff) | |
| parent | common_types: Make NonCopyable constructor constexpr (diff) | |
| download | yuzu-a2024d749790f94979ad1f7a02363ab53f7de518.tar.gz yuzu-a2024d749790f94979ad1f7a02363ab53f7de518.tar.xz yuzu-a2024d749790f94979ad1f7a02363ab53f7de518.zip | |
Merge pull request #1509 from lioncash/noncopy
common: Minor changes to NonCopyable
| -rw-r--r-- | src/common/common_types.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/common/common_types.h b/src/common/common_types.h index fa3e0b8d6..9f51dff18 100644 --- a/src/common/common_types.h +++ b/src/common/common_types.h | |||
| @@ -53,9 +53,9 @@ typedef u32 PAddr; ///< Represents a pointer in the ARM11 physical address space | |||
| 53 | // An inheritable class to disallow the copy constructor and operator= functions | 53 | // An inheritable class to disallow the copy constructor and operator= functions |
| 54 | class NonCopyable { | 54 | class NonCopyable { |
| 55 | protected: | 55 | protected: |
| 56 | NonCopyable() = default; | 56 | constexpr NonCopyable() = default; |
| 57 | ~NonCopyable() = default; | 57 | ~NonCopyable() = default; |
| 58 | 58 | ||
| 59 | NonCopyable(NonCopyable&) = delete; | 59 | NonCopyable(const NonCopyable&) = delete; |
| 60 | NonCopyable& operator=(NonCopyable&) = delete; | 60 | NonCopyable& operator=(const NonCopyable&) = delete; |
| 61 | }; | 61 | }; |