octo
/
yuzu-mainline
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #940 from lioncash/private 

kernel/event: Make data members private
This commit is contained in:
bunnei 2018-08-06 21:31:25 -04:00 committed by GitHub
parent cf82358ee6 2feb1a8ba6
commit f179e87864
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/core/hle/kernel/event.h
View File

@ -31,10 +31,9 @@ public:
return HANDLE_TYPE; return HANDLE_TYPE;
} }
ResetType reset_type; ///< Current ResetType ResetType GetResetType() const {
return reset_type;
bool signaled; ///< Whether the event has already been signaled }
std::string name; ///< Name of event (optional)
bool ShouldWait(Thread* thread) const override; bool ShouldWait(Thread* thread) const override;
void Acquire(Thread* thread) override; void Acquire(Thread* thread) override;
@ -47,6 +46,11 @@ public:
private: private:
Event(); Event();
~Event() override; ~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 } // namespace Kernel

2
src/yuzu/debugger/wait_tree.cpp
View File

@ -316,7 +316,7 @@ std::vector<std::unique_ptr<WaitTreeItem>> WaitTreeEvent::GetChildren() const {
list.push_back(std::make_unique<WaitTreeText>( list.push_back(std::make_unique<WaitTreeText>(
tr("reset type = %1") 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; return list;
} }