diff options
| author | bunnei <bunneidev@gmail.com> | 2018-08-13 01:41:23 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-13 01:41:23 -0400 |
| commit | 2e89719d3ee1f79df81b1fb596f3a41c1a125e8e (patch) | |
| tree | 7dd4cd757ce279eb8cfe8a2b6bc17c4b865832e0 /src/core/hle/kernel/kernel.cpp | |
| parent | baaafbd5ea7fe74b75c2f97df9b4faf458795ecf (diff) | |
| parent | 3476f5b4d38d31d6f17a335311a2fa814be8bf25 (diff) | |
Merge pull request #1048 from lioncash/atomic
kernel/object: Tighten object against data races
Diffstat (limited to 'src/core/hle/kernel/kernel.cpp')
| -rw-r--r-- | src/core/hle/kernel/kernel.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp index 1b0cd0abf..8c19e86d3 100644 --- a/src/core/hle/kernel/kernel.cpp +++ b/src/core/hle/kernel/kernel.cpp @@ -11,7 +11,7 @@ namespace Kernel { -unsigned int Object::next_object_id; +std::atomic<u32> Object::next_object_id{0}; /// Initialize the kernel void Init() { |