diff options
| author | bunnei <bunneidev@gmail.com> | 2018-08-07 03:31:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-07 03:31:25 +0200 |
| commit | f179e87864b2ab2e0a482311dff2bd271fbbbeda (patch) | |
| tree | 6b0c5d0e4959fa024ad766cdc5d24c867a418999 | |
| parent | Merge pull request #936 from bunnei/avoid-copies (diff) | |
| parent | kernel/event: Make data members private (diff) | |
| download | yuzu-f179e87864b2ab2e0a482311dff2bd271fbbbeda.tar yuzu-f179e87864b2ab2e0a482311dff2bd271fbbbeda.tar.gz yuzu-f179e87864b2ab2e0a482311dff2bd271fbbbeda.tar.bz2 yuzu-f179e87864b2ab2e0a482311dff2bd271fbbbeda.tar.lz yuzu-f179e87864b2ab2e0a482311dff2bd271fbbbeda.tar.xz yuzu-f179e87864b2ab2e0a482311dff2bd271fbbbeda.tar.zst yuzu-f179e87864b2ab2e0a482311dff2bd271fbbbeda.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/core/hle/kernel/event.h | 12 | ||||
| -rw-r--r-- | src/yuzu/debugger/wait_tree.cpp | 2 |
2 files changed, 9 insertions, 5 deletions
diff --git a/src/core/hle/kernel/event.h b/src/core/hle/kernel/event.h index 1c99911b2..3c20c05e8 100644 --- a/src/core/hle/kernel/event.h +++ b/src/core/hle/kernel/event.h @@ -31,10 +31,9 @@ public: return HANDLE_TYPE; } - ResetType reset_type; ///< Current ResetType - - bool signaled; ///< Whether the event has already been signaled - std::string name; ///< Name of event (optional) + ResetType GetResetType() const { + return reset_type; + } bool ShouldWait(Thread* thread) const override; void Acquire(Thread* thread) override; @@ -47,6 +46,11 @@ public: private: Event(); ~Event() override; + + ResetType reset_type; ///< Current ResetType + + bool signaled; ///< Whether the event has already been signaled + std::string name; ///< Name of event (optional) }; } // namespace Kernel diff --git a/src/yuzu/debugger/wait_tree.cpp b/src/yuzu/debugger/wait_tree.cpp index f5a5697a0..2acfdb8a9 100644 --- a/src/yuzu/debugger/wait_tree.cpp +++ b/src/yuzu/debugger/wait_tree.cpp @@ -316,7 +316,7 @@ std::vector<std::unique_ptr<WaitTreeItem>> WaitTreeEvent::GetChildren() const { list.push_back(std::make_unique<WaitTreeText>( tr("reset type = %1") - .arg(GetResetTypeQString(static_cast<const Kernel::Event&>(object).reset_type)))); + .arg(GetResetTypeQString(static_cast<const Kernel::Event&>(object).GetResetType())))); return list; } |