diff options
| author | 2020-12-05 00:07:00 -0800 | |
|---|---|---|
| committer | 2020-12-06 00:27:13 -0800 | |
| commit | b1b4f2337e286e2c079634906224fc67ae3ff7c3 (patch) | |
| tree | cbf6d4f17bc0d142391b04f68d58eecc443827de /src | |
| parent | hle: kernel: KAbstractSchedulerLock: Various style fixes based on code review... (diff) | |
| download | yuzu-b1b4f2337e286e2c079634906224fc67ae3ff7c3.tar.gz yuzu-b1b4f2337e286e2c079634906224fc67ae3ff7c3.tar.xz yuzu-b1b4f2337e286e2c079634906224fc67ae3ff7c3.zip | |
hle: kernel: KScopedLock: Various style fixes based on code review feedback.
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/hle/kernel/k_scoped_lock.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/core/hle/kernel/k_scoped_lock.h b/src/core/hle/kernel/k_scoped_lock.h index 03320859f..d7cc557b2 100644 --- a/src/core/hle/kernel/k_scoped_lock.h +++ b/src/core/hle/kernel/k_scoped_lock.h | |||
| @@ -12,7 +12,7 @@ | |||
| 12 | namespace Kernel { | 12 | namespace Kernel { |
| 13 | 13 | ||
| 14 | template <typename T> | 14 | template <typename T> |
| 15 | concept KLockable = !std::is_reference<T>::value && requires(T & t) { | 15 | concept KLockable = !std::is_reference_v<T> && requires(T & t) { |
| 16 | { t.Lock() } | 16 | { t.Lock() } |
| 17 | ->std::same_as<void>; | 17 | ->std::same_as<void>; |
| 18 | { t.Unlock() } | 18 | { t.Unlock() } |
| @@ -20,11 +20,7 @@ concept KLockable = !std::is_reference<T>::value && requires(T & t) { | |||
| 20 | }; | 20 | }; |
| 21 | 21 | ||
| 22 | template <typename T> | 22 | template <typename T> |
| 23 | requires KLockable<T> class KScopedLock : NonCopyable { | 23 | requires KLockable<T> class KScopedLock { |
| 24 | |||
| 25 | private: | ||
| 26 | T* lock_ptr; | ||
| 27 | |||
| 28 | public: | 24 | public: |
| 29 | explicit KScopedLock(T* l) : lock_ptr(l) { | 25 | explicit KScopedLock(T* l) : lock_ptr(l) { |
| 30 | this->lock_ptr->Lock(); | 26 | this->lock_ptr->Lock(); |
| @@ -34,6 +30,12 @@ public: | |||
| 34 | ~KScopedLock() { | 30 | ~KScopedLock() { |
| 35 | this->lock_ptr->Unlock(); | 31 | this->lock_ptr->Unlock(); |
| 36 | } | 32 | } |
| 33 | |||
| 34 | KScopedLock(const KScopedLock&) = delete; | ||
| 35 | KScopedLock(KScopedLock&&) = delete; | ||
| 36 | |||
| 37 | private: | ||
| 38 | T* lock_ptr; | ||
| 37 | }; | 39 | }; |
| 38 | 40 | ||
| 39 | } // namespace Kernel | 41 | } // namespace Kernel |