diff options
author | Huw Pascoe <huw.pascoe@gmail.com> | 2017-09-27 00:26:09 +0100 |
---|---|---|
committer | Huw Pascoe <huw.pascoe@gmail.com> | 2017-09-30 09:34:35 +0100 |
commit | a13ab958cbba75bc9abd1ca50f3030a10a75784e (patch) | |
tree | 016f6866d15fb9a41a15666f492bed352d95b523 /src/core/hle/ipc.h | |
parent | b07af7dda822898e9c8f231c5ddcd1741d93dbef (diff) |
Fixed type conversion ambiguity
Diffstat (limited to 'src/core/hle/ipc.h')
-rw-r--r-- | src/core/hle/ipc.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/hle/ipc.h b/src/core/hle/ipc.h index f7f96125a..87ed85df6 100644 --- a/src/core/hle/ipc.h +++ b/src/core/hle/ipc.h @@ -122,11 +122,11 @@ union StaticBufferDescInfo { BitField<14, 18, u32> size; }; -inline u32 StaticBufferDesc(u32 size, u8 buffer_id) { +inline u32 StaticBufferDesc(size_t size, u8 buffer_id) { StaticBufferDescInfo info{}; info.descriptor_type.Assign(StaticBuffer); info.buffer_id.Assign(buffer_id); - info.size.Assign(size); + info.size.Assign(static_cast<u32>(size)); return info.raw; } @@ -160,11 +160,11 @@ union MappedBufferDescInfo { BitField<4, 28, u32> size; }; -inline u32 MappedBufferDesc(u32 size, MappedBufferPermissions perms) { +inline u32 MappedBufferDesc(size_t size, MappedBufferPermissions perms) { MappedBufferDescInfo info{}; info.flags.Assign(MappedBuffer); info.perms.Assign(perms); - info.size.Assign(size); + info.size.Assign(static_cast<u32>(size)); return info.raw; } |