diff options
| author | bunnei <bunneidev@gmail.com> | 2015-05-01 19:05:18 -0400 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2015-05-01 19:05:18 -0400 |
| commit | 6a2d8c46f21e8813e0472dba28932ed461ce1a66 (patch) | |
| tree | d7057cf9926c822c12cc7d82814a252db79ca600 /src/core/hle/kernel/kernel.h | |
| parent | 4d30edc11effef4021a7bd7d5dfe1d92678708b9 (diff) | |
| parent | 046dd6e3ef3f4b4da2dd2eef0bdfe0f6fb28b1d8 (diff) | |
Merge pull request #713 from bunnei/qt-emuthread-fixes
Fix emulation state resetting to support multiple emulation sessions
Diffstat (limited to 'src/core/hle/kernel/kernel.h')
| -rw-r--r-- | src/core/hle/kernel/kernel.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/hle/kernel/kernel.h b/src/core/hle/kernel/kernel.h index 2d295ea00..ab06fa025 100644 --- a/src/core/hle/kernel/kernel.h +++ b/src/core/hle/kernel/kernel.h @@ -95,12 +95,13 @@ public: return false; } +public: + static unsigned int next_object_id; + private: friend void intrusive_ptr_add_ref(Object*); friend void intrusive_ptr_release(Object*); - static unsigned int next_object_id; - unsigned int ref_count = 0; unsigned int object_id = next_object_id++; }; |