Browse Source

Merge pull request #4463 from lioncash/lockdiscard

kernel/scheduler: Mark SchedulerLock constructor as nodiscard
pull/15/merge
bunnei 5 years ago
committed by GitHub
parent
commit
2aabd1eb05
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      src/core/frontend/emu_window.h
  2. 2
      src/core/hle/kernel/scheduler.h

4
src/core/frontend/emu_window.h

@ -39,7 +39,7 @@ public:
class Scoped { class Scoped {
public: public:
explicit Scoped(GraphicsContext& context_) : context(context_) {
[[nodiscard]] explicit Scoped(GraphicsContext& context_) : context(context_) {
context.MakeCurrent(); context.MakeCurrent();
} }
~Scoped() { ~Scoped() {
@ -52,7 +52,7 @@ public:
/// Calls MakeCurrent on the context and calls DoneCurrent when the scope for the returned value /// Calls MakeCurrent on the context and calls DoneCurrent when the scope for the returned value
/// ends /// ends
Scoped Acquire() {
[[nodiscard]] Scoped Acquire() {
return Scoped{*this}; return Scoped{*this};
} }
}; };

2
src/core/hle/kernel/scheduler.h

@ -289,7 +289,7 @@ private:
class SchedulerLock { class SchedulerLock {
public: public:
explicit SchedulerLock(KernelCore& kernel);
[[nodiscard]] explicit SchedulerLock(KernelCore& kernel);
~SchedulerLock(); ~SchedulerLock();
protected: protected:

Loading…
Cancel
Save