Skip to content

Commit fa5963a

Browse files
committed
Fix -Wclass-memaccess warnings/errors
Recent GCC versions warn about using memcpy/memmove to write to a class pointer (-Wclass-memaccess). Avoid the warnings by casting to void* first. Closes Tencent#1086. Closes Tencent#1205. Closes Tencent#1246.
1 parent 4b4583b commit fa5963a

File tree

1 file changed

+5
-15
lines changed

1 file changed

+5
-15
lines changed

include/rapidjson/document.h

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1513,7 +1513,7 @@ class GenericValue {
15131513
MemberIterator pos = MemberBegin() + (first - MemberBegin());
15141514
for (MemberIterator itr = pos; itr != last; ++itr)
15151515
itr->~Member();
1516-
std::memmove(&*pos, &*last, static_cast<size_t>(MemberEnd() - last) * sizeof(Member));
1516+
std::memmove(static_cast<void*>(&*pos), &*last, static_cast<size_t>(MemberEnd() - last) * sizeof(Member));
15171517
data_.o.size -= static_cast<SizeType>(last - first);
15181518
return pos;
15191519
}
@@ -1716,8 +1716,8 @@ class GenericValue {
17161716
RAPIDJSON_ASSERT(last <= End());
17171717
ValueIterator pos = Begin() + (first - Begin());
17181718
for (ValueIterator itr = pos; itr != last; ++itr)
1719-
itr->~GenericValue();
1720-
std::memmove(pos, last, static_cast<size_t>(End() - last) * sizeof(GenericValue));
1719+
itr->~GenericValue();
1720+
std::memmove(static_cast<void*>(pos), last, static_cast<size_t>(End() - last) * sizeof(GenericValue));
17211721
data_.a.size -= static_cast<SizeType>(last - first);
17221722
return pos;
17231723
}
@@ -2032,12 +2032,7 @@ class GenericValue {
20322032
if (count) {
20332033
GenericValue* e = static_cast<GenericValue*>(allocator.Malloc(count * sizeof(GenericValue)));
20342034
SetElementsPointer(e);
2035-
RAPIDJSON_DIAG_PUSH
2036-
#if defined(__GNUC__) && __GNUC__ >= 8
2037-
RAPIDJSON_DIAG_OFF(class-memaccess) // ignore complains from gcc that no trivial copy constructor exists.
2038-
#endif
2039-
std::memcpy(e, values, count * sizeof(GenericValue));
2040-
RAPIDJSON_DIAG_POP
2035+
std::memcpy(static_cast<void*>(e), values, count * sizeof(GenericValue));
20412036
}
20422037
else
20432038
SetElementsPointer(0);
@@ -2050,12 +2045,7 @@ RAPIDJSON_DIAG_POP
20502045
if (count) {
20512046
Member* m = static_cast<Member*>(allocator.Malloc(count * sizeof(Member)));
20522047
SetMembersPointer(m);
2053-
RAPIDJSON_DIAG_PUSH
2054-
#if defined(__GNUC__) && __GNUC__ >= 8
2055-
RAPIDJSON_DIAG_OFF(class-memaccess) // ignore complains from gcc that no trivial copy constructor exists.
2056-
#endif
2057-
std::memcpy(m, members, count * sizeof(Member));
2058-
RAPIDJSON_DIAG_POP
2048+
std::memcpy(static_cast<void*>(m), members, count * sizeof(Member));
20592049
}
20602050
else
20612051
SetMembersPointer(0);

0 commit comments

Comments
 (0)