Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge commit '9886840b79d617a32764ad52ef4747f5fd999250'

Browse Source
This commit is contained in:
Gioacchino Mazzurco 2018-06-09 18:10:22 +02:00
commit 6010104127
No known key found for this signature in database
GPG Key ID: A1FBCA3872E87051
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libretroshare/src/serialiser/rsserializer.h
View File

@ -225,6 +225,13 @@ struct RsGenericSerializer : RsSerialType
/** Allow shared allocator usage to avoid costly JSON deepcopy for /** Allow shared allocator usage to avoid costly JSON deepcopy for
* nested RsSerializable */ * nested RsSerializable */
SerializeContext( SerializeContext(
uint8_t *data, uint32_t size,
SerializationFlags flags = SERIALIZATION_FLAG_NONE,
RsJson::AllocatorType* allocator = nullptr) :
mData(data), mSize(size), mOffset(0), mOk(true), mFlags(flags),
mJson(rapidjson::kObjectType, allocator) {}
RS_DEPRECATED SerializeContext(
uint8_t *data, uint32_t size, SerializationFormat format, uint8_t *data, uint32_t size, SerializationFormat format,
SerializationFlags flags, SerializationFlags flags,
RsJson::AllocatorType* allocator = nullptr) : RsJson::AllocatorType* allocator = nullptr) :