generic-library/rapidjson
1
0
Fork 0
mirror of https://github.com/Tencent/rapidjson.git synced 2025-11-04 04:10:01 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #969 from pah/fixes/962-copy-const-strings

Browse Source 
Fixup #964 by forwarding copyConstStrings recursively
This commit is contained in:
Milo Yip
2017-05-28 14:49:15 +08:00
committed by GitHub
parent 33443e63a9 68c96e987b
commit 342a616a7f
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/rapidjson/document.h
View File

@@ -626,8 +626,8 @@ public:
Member* lm = reinterpret_cast<Member*>(allocator.Malloc(count * sizeof(Member))); Member* lm = reinterpret_cast<Member*>(allocator.Malloc(count * sizeof(Member)));
const typename GenericValue<Encoding,SourceAllocator>::Member* rm = rhs.GetMembersPointer(); const typename GenericValue<Encoding,SourceAllocator>::Member* rm = rhs.GetMembersPointer();
for (SizeType i = 0; i < count; i++) { for (SizeType i = 0; i < count; i++) {
new (&lm[i].name) GenericValue(rm[i].name, allocator); new (&lm[i].name) GenericValue(rm[i].name, allocator, copyConstStrings);
new (&lm[i].value) GenericValue(rm[i].value, allocator); new (&lm[i].value) GenericValue(rm[i].value, allocator, copyConstStrings);
} }
data_.f.flags = kObjectFlag; data_.f.flags = kObjectFlag;
data_.o.size = data_.o.capacity = count; data_.o.size = data_.o.capacity = count;
@@ -639,7 +639,7 @@ public:
GenericValue* le = reinterpret_cast<GenericValue*>(allocator.Malloc(count * sizeof(GenericValue))); GenericValue* le = reinterpret_cast<GenericValue*>(allocator.Malloc(count * sizeof(GenericValue)));
const GenericValue<Encoding,SourceAllocator>* re = rhs.GetElementsPointer(); const GenericValue<Encoding,SourceAllocator>* re = rhs.GetElementsPointer();
for (SizeType i = 0; i < count; i++) for (SizeType i = 0; i < count; i++)
new (&le[i]) GenericValue(re[i], allocator); new (&le[i]) GenericValue(re[i], allocator, copyConstStrings);
data_.f.flags = kArrayFlag; data_.f.flags = kArrayFlag;
data_.a.size = data_.a.capacity = count; data_.a.size = data_.a.capacity = count;
SetElementsPointer(le); SetElementsPointer(le);