summaryrefslogtreecommitdiff
path: root/src/common
diff options
context:
space:
mode:
authorGravatar bunnei2020-11-06 10:33:13 -0800
committerGravatar GitHub2020-11-06 10:33:13 -0800
commit91a45834fd10620a9c3bb567183682a9e6a88217 (patch)
tree162d9bc5ac1b219f9534374a6c6e75a202aca6dd /src/common
parentMerge pull request #4894 from lioncash/fn (diff)
parentGeneral: Fix clang build (diff)
downloadyuzu-91a45834fd10620a9c3bb567183682a9e6a88217.tar.gz
yuzu-91a45834fd10620a9c3bb567183682a9e6a88217.tar.xz
yuzu-91a45834fd10620a9c3bb567183682a9e6a88217.zip
Merge pull request #4891 from lioncash/clang2
General: Fix clang build
Diffstat (limited to 'src/common')
-rw-r--r--src/common/fiber.h4
-rw-r--r--src/common/spin_lock.h8
2 files changed, 10 insertions, 2 deletions
diff --git a/src/common/fiber.h b/src/common/fiber.h
index 699286ee2..1a027be96 100644
--- a/src/common/fiber.h
+++ b/src/common/fiber.h
@@ -41,8 +41,8 @@ public:
41 Fiber(const Fiber&) = delete; 41 Fiber(const Fiber&) = delete;
42 Fiber& operator=(const Fiber&) = delete; 42 Fiber& operator=(const Fiber&) = delete;
43 43
44 Fiber(Fiber&&) = default; 44 Fiber(Fiber&&) = delete;
45 Fiber& operator=(Fiber&&) = default; 45 Fiber& operator=(Fiber&&) = delete;
46 46
47 /// Yields control from Fiber 'from' to Fiber 'to' 47 /// Yields control from Fiber 'from' to Fiber 'to'
48 /// Fiber 'from' must be the currently running fiber. 48 /// Fiber 'from' must be the currently running fiber.
diff --git a/src/common/spin_lock.h b/src/common/spin_lock.h
index 4f946a258..06ac2f5bb 100644
--- a/src/common/spin_lock.h
+++ b/src/common/spin_lock.h
@@ -15,6 +15,14 @@ namespace Common {
15 */ 15 */
16class SpinLock { 16class SpinLock {
17public: 17public:
18 SpinLock() = default;
19
20 SpinLock(const SpinLock&) = delete;
21 SpinLock& operator=(const SpinLock&) = delete;
22
23 SpinLock(SpinLock&&) = delete;
24 SpinLock& operator=(SpinLock&&) = delete;
25
18 void lock(); 26 void lock();
19 void unlock(); 27 void unlock();
20 [[nodiscard]] bool try_lock(); 28 [[nodiscard]] bool try_lock();