summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2021-05-19 18:43:47 -0700
committerGitHub <noreply@github.com>2021-05-19 18:43:47 -0700
commitb5d21cc1b1733c7f03e1179dbddc932cbf716490 (patch)
tree029380b1e216f8b8244258de496dea327043e1d7
parent41b1f8d61642622e09689795515927bc24180f67 (diff)
parent0aff3ba2ffd00d3bc605d468d70815731a7ec6b0 (diff)
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.h3
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 {
}
}
- return (next - start) * sizeof(MemberType) + Offset;
+ return static_cast<ptrdiff_t>(static_cast<size_t>(next - start) * sizeof(MemberType) +
+ Offset);
}
static constexpr std::ptrdiff_t OffsetOf(MemberType ParentType::*member) {