gvsafronov/rapidjson
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GenericValue: use generated assignment/destructor for GenericMember

Browse Source
This commit is contained in:
Philipp A. Hartmann 2014-07-31 11:21:18 +02:00
parent 59fee54f9d
commit c0fcdcc478
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/rapidjson/document.h
View File

@ -464,8 +464,7 @@ public:
case kObjectFlag: case kObjectFlag:
for (MemberIterator m = MemberBegin(); m != MemberEnd(); ++m) { for (MemberIterator m = MemberBegin(); m != MemberEnd(); ++m) {
m->name.~GenericValue(); m->~GenericMember();
m->value.~GenericValue();
} }
Allocator::Free(data_.o.members); Allocator::Free(data_.o.members);
break; break;
@ -861,13 +860,11 @@ public:
MemberIterator last(data_.o.members + (data_.o.size - 1)); MemberIterator last(data_.o.members + (data_.o.size - 1));
if (data_.o.size > 1 && m != last) { if (data_.o.size > 1 && m != last) {
// Move the last one to this place // Move the last one to this place
m->name = last->name; *m = *last;
m->value = last->value;
} }
else { else {
// Only one left, just destroy // Only one left, just destroy
m->name.~GenericValue(); m->~GenericMember();
m->value.~GenericValue();
} }
--data_.o.size; --data_.o.size;
return m; return m;