diff options
| author | 2018-08-13 01:41:23 -0400 | |
|---|---|---|
| committer | 2018-08-13 01:41:23 -0400 | |
| commit | 2e89719d3ee1f79df81b1fb596f3a41c1a125e8e (patch) | |
| tree | 7dd4cd757ce279eb8cfe8a2b6bc17c4b865832e0 /src/core/hle/kernel/kernel.cpp | |
| parent | Merge pull request #1047 from bunnei/rgba16-uint (diff) | |
| parent | kernel/object: Tighten object against data races (diff) | |
| download | yuzu-2e89719d3ee1f79df81b1fb596f3a41c1a125e8e.tar.gz yuzu-2e89719d3ee1f79df81b1fb596f3a41c1a125e8e.tar.xz yuzu-2e89719d3ee1f79df81b1fb596f3a41c1a125e8e.zip | |
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 @@ | |||
| 11 | 11 | ||
| 12 | namespace Kernel { | 12 | namespace Kernel { |
| 13 | 13 | ||
| 14 | unsigned int Object::next_object_id; | 14 | std::atomic<u32> Object::next_object_id{0}; |
| 15 | 15 | ||
| 16 | /// Initialize the kernel | 16 | /// Initialize the kernel |
| 17 | void Init() { | 17 | void Init() { |