Browse Source
Merge pull request #940 from lioncash/private
kernel/event: Make data members private
pull/15/merge
bunnei
7 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
9 additions and
5 deletions
-
src/core/hle/kernel/event.h
-
src/yuzu/debugger/wait_tree.cpp
|
|
|
@ -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 |
|
|
|
@ -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; |
|
|
|
} |
|
|
|
|
|
|
|
|