diff options
| author |  bunnei | 2021-05-19 18:43:47 -0700 |
|---|---|---|
| committer |  GitHub | 2021-05-19 18:43:47 -0700 |
| commit | b5d21cc1b1733c7f03e1179dbddc932cbf716490 (patch) | |
| tree | 029380b1e216f8b8244258de496dea327043e1d7 | |
| parent | Merge pull request #6310 from german77/nanMotion (diff) | |
| parent | parent_of_member: Make sign conversion explicit in OffsetOfImpl() (diff) | |
| download | yuzu-b5d21cc1b1733c7f03e1179dbddc932cbf716490.tar.gz yuzu-b5d21cc1b1733c7f03e1179dbddc932cbf716490.tar.xz yuzu-b5d21cc1b1733c7f03e1179dbddc932cbf716490.zip | |
Merge pull request #6297 from lioncash/common-conv
parent_of_member: Make sign conversion explicit in OffsetOfImpl()
| -rw-r--r-- | src/common/parent_of_member.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/common/parent_of_member.h b/src/common/parent_of_member.h index e0f8ab5c8..58c70b0e7 100644 --- a/src/common/parent_of_member.h +++ b/src/common/parent_of_member.h | |||
| @@ -109,7 +109,8 @@ struct OffsetOfCalculator { | |||
| 109 | } | 109 | } |
| 110 | } | 110 | } |
| 111 | 111 | ||
| 112 | return (next - start) * sizeof(MemberType) + Offset; | 112 | return static_cast<ptrdiff_t>(static_cast<size_t>(next - start) * sizeof(MemberType) + |
| 113 | Offset); | ||
| 113 | } | 114 | } |
| 114 | 115 | ||
| 115 | static constexpr std::ptrdiff_t OffsetOf(MemberType ParentType::*member) { | 116 | static constexpr std::ptrdiff_t OffsetOf(MemberType ParentType::*member) { |