summaryrefslogtreecommitdiff
path: root/src/core/hle/kernel/object.cpp
diff options
context:
space:
mode:
authorGravatar bunnei2018-08-30 10:02:50 -0400
committerGravatar GitHub2018-08-30 10:02:50 -0400
commit5094dfa081c7275e35496374a42996b11f0f6005 (patch)
tree8cdfb8c270c6299a1b172fb9c14856684bedf084 /src/core/hle/kernel/object.cpp
parentMerge pull request #1202 from FearlessTobi/port-3825 (diff)
parentkernel: Eliminate kernel global state (diff)
downloadyuzu-5094dfa081c7275e35496374a42996b11f0f6005.tar.gz
yuzu-5094dfa081c7275e35496374a42996b11f0f6005.tar.xz
yuzu-5094dfa081c7275e35496374a42996b11f0f6005.zip
Merge pull request #1198 from lioncash/kernel
kernel: Eliminate kernel global state
Diffstat (limited to 'src/core/hle/kernel/object.cpp')
-rw-r--r--src/core/hle/kernel/object.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/core/hle/kernel/object.cpp b/src/core/hle/kernel/object.cpp
index cdba272f5..d51562d92 100644
--- a/src/core/hle/kernel/object.cpp
+++ b/src/core/hle/kernel/object.cpp
@@ -3,10 +3,12 @@
3// Refer to the license.txt file included. 3// Refer to the license.txt file included.
4 4
5#include "common/assert.h" 5#include "common/assert.h"
6#include "core/hle/kernel/kernel.h"
6#include "core/hle/kernel/object.h" 7#include "core/hle/kernel/object.h"
7 8
8namespace Kernel { 9namespace Kernel {
9 10
11Object::Object(KernelCore& kernel) : kernel{kernel}, object_id{kernel.CreateNewObjectID()} {}
10Object::~Object() = default; 12Object::~Object() = default;
11 13
12bool Object::IsWaitable() const { 14bool Object::IsWaitable() const {