diff options
author | Lioncash <mathew1800@gmail.com> | 2018-08-13 06:13:47 +0200 |
---|---|---|
committer | Lioncash <mathew1800@gmail.com> | 2018-08-13 06:16:40 +0200 |
commit | 3476f5b4d38d31d6f17a335311a2fa814be8bf25 (patch) | |
tree | d0929304994c704ac6dd152a92d528c0e25d715b /src/core/hle/kernel/kernel.cpp | |
parent | Merge pull request #1043 from Subv/timing (diff) | |
download | yuzu-3476f5b4d38d31d6f17a335311a2fa814be8bf25.tar yuzu-3476f5b4d38d31d6f17a335311a2fa814be8bf25.tar.gz yuzu-3476f5b4d38d31d6f17a335311a2fa814be8bf25.tar.bz2 yuzu-3476f5b4d38d31d6f17a335311a2fa814be8bf25.tar.lz yuzu-3476f5b4d38d31d6f17a335311a2fa814be8bf25.tar.xz yuzu-3476f5b4d38d31d6f17a335311a2fa814be8bf25.tar.zst yuzu-3476f5b4d38d31d6f17a335311a2fa814be8bf25.zip |
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() { |