Merge pull request #6297 from lioncash/common-conv

parent_of_member: Make sign conversion explicit in OffsetOfImpl()
2021-05-19 18:43:47 -07:00 · 2021-05-19 18:43:47 -07:00 · b5d21cc1b1
commit b5d21cc1b1
parent 41b1f8d616 0aff3ba2ff
1 changed files with 2 additions and 1 deletions
--- 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) {