Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
Suyu
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
many-archive
Suyu
Commits
f179e878
There was an error fetching the commit references. Please try again later.
Unverified
Commit
f179e878
authored
6 years ago
by
bunnei
Committed by
GitHub
6 years ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #940 from lioncash/private
kernel/event: Make data members private
parents
cf82358e
2feb1a8b
No related branches found
No related tags found
Loading
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/core/hle/kernel/event.h
+8
-4
8 additions, 4 deletions
src/core/hle/kernel/event.h
src/yuzu/debugger/wait_tree.cpp
+1
-1
1 addition, 1 deletion
src/yuzu/debugger/wait_tree.cpp
with
9 additions
and
5 deletions
src/core/hle/kernel/event.h
+
8
−
4
View file @
f179e878
...
...
@@ -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
This diff is collapsed.
Click to expand it.
src/yuzu/debugger/wait_tree.cpp
+
1
−
1
View file @
f179e878
...
...
@@ -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
).
r
eset
_t
ype
))));
.
arg
(
GetResetTypeQString
(
static_cast
<
const
Kernel
::
Event
&>
(
object
).
GetR
eset
T
ype
()
))));
return
list
;
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment