From c0fcdcc478664ffcb21bd76c4f0e55a06468d8c5 Mon Sep 17 00:00:00 2001 From: "Philipp A. Hartmann" Date: Thu, 31 Jul 2014 11:21:18 +0200 Subject: [PATCH] GenericValue: use generated assignment/destructor for GenericMember --- include/rapidjson/document.h | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/include/rapidjson/document.h b/include/rapidjson/document.h index fe20de6..a52d986 100644 --- a/include/rapidjson/document.h +++ b/include/rapidjson/document.h @@ -464,8 +464,7 @@ public: case kObjectFlag: for (MemberIterator m = MemberBegin(); m != MemberEnd(); ++m) { - m->name.~GenericValue(); - m->value.~GenericValue(); + m->~GenericMember(); } Allocator::Free(data_.o.members); break; @@ -861,13 +860,11 @@ public: MemberIterator last(data_.o.members + (data_.o.size - 1)); if (data_.o.size > 1 && m != last) { // Move the last one to this place - m->name = last->name; - m->value = last->value; + *m = *last; } else { // Only one left, just destroy - m->name.~GenericValue(); - m->value.~GenericValue(); + m->~GenericMember(); } --data_.o.size; return m;