diff options
| author | raven02 <jacky.kktsui@yahoo.com.hk> | 2018-09-19 19:53:11 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-19 19:53:11 +0800 |
| commit | c8f9bbbf859c0e38cf691b64c67761382fcebfc2 (patch) | |
| tree | 99529c2277a6b740a6e278985c5147fa649c5497 /src/core/hle/kernel/shared_memory.h | |
| parent | b91f7d5d67a67115926ad03526f71a7cc3dfb326 (diff) | |
| parent | b33ce787b7959e1bfd3b5ae4886b6e137fb97711 (diff) | |
Merge branch 'master' into tlds
Diffstat (limited to 'src/core/hle/kernel/shared_memory.h')
| -rw-r--r-- | src/core/hle/kernel/shared_memory.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/hle/kernel/shared_memory.h b/src/core/hle/kernel/shared_memory.h index 2c729afe3..2c06bb7ce 100644 --- a/src/core/hle/kernel/shared_memory.h +++ b/src/core/hle/kernel/shared_memory.h @@ -119,7 +119,7 @@ public: /// Backing memory for this shared memory block. std::shared_ptr<std::vector<u8>> backing_block; /// Offset into the backing block for this shared memory. - size_t backing_block_offset; + std::size_t backing_block_offset; /// Size of the memory block. Page-aligned. u64 size; /// Permission restrictions applied to the process which created the block. |