diff --git a/include/rapidjson/document.h b/include/rapidjson/document.h index d25c5c0a..bf9e6fdb 100644 --- a/include/rapidjson/document.h +++ b/include/rapidjson/document.h @@ -1513,7 +1513,7 @@ public: MemberIterator pos = MemberBegin() + (first - MemberBegin()); for (MemberIterator itr = pos; itr != last; ++itr) itr->~Member(); - std::memmove(&*pos, &*last, static_cast(MemberEnd() - last) * sizeof(Member)); + std::memmove(static_cast(&*pos), &*last, static_cast(MemberEnd() - last) * sizeof(Member)); data_.o.size -= static_cast(last - first); return pos; } @@ -1716,8 +1716,8 @@ public: RAPIDJSON_ASSERT(last <= End()); ValueIterator pos = Begin() + (first - Begin()); for (ValueIterator itr = pos; itr != last; ++itr) - itr->~GenericValue(); - std::memmove(pos, last, static_cast(End() - last) * sizeof(GenericValue)); + itr->~GenericValue(); + std::memmove(static_cast(pos), last, static_cast(End() - last) * sizeof(GenericValue)); data_.a.size -= static_cast(last - first); return pos; } @@ -2032,12 +2032,7 @@ private: if (count) { GenericValue* e = static_cast(allocator.Malloc(count * sizeof(GenericValue))); SetElementsPointer(e); -RAPIDJSON_DIAG_PUSH -#if defined(__GNUC__) && __GNUC__ >= 8 -RAPIDJSON_DIAG_OFF(class-memaccess) // ignore complains from gcc that no trivial copy constructor exists. -#endif - std::memcpy(e, values, count * sizeof(GenericValue)); -RAPIDJSON_DIAG_POP + std::memcpy(static_cast(e), values, count * sizeof(GenericValue)); } else SetElementsPointer(0); @@ -2050,12 +2045,7 @@ RAPIDJSON_DIAG_POP if (count) { Member* m = static_cast(allocator.Malloc(count * sizeof(Member))); SetMembersPointer(m); -RAPIDJSON_DIAG_PUSH -#if defined(__GNUC__) && __GNUC__ >= 8 -RAPIDJSON_DIAG_OFF(class-memaccess) // ignore complains from gcc that no trivial copy constructor exists. -#endif - std::memcpy(m, members, count * sizeof(Member)); -RAPIDJSON_DIAG_POP + std::memcpy(static_cast(m), members, count * sizeof(Member)); } else SetMembersPointer(0);