diff options
author | Christian Mollekopf <chrigi_1@fastmail.fm> | 2015-04-12 16:13:56 +0200 |
---|---|---|
committer | Christian Mollekopf <chrigi_1@fastmail.fm> | 2015-04-12 16:13:56 +0200 |
commit | b9e5ac84bd7f81473a87eee9dad6c75fdda7e62e (patch) | |
tree | 5d8c8f50d54c0cc0bc207ce391a9399628d7b0b8 /common/entitybuffer.cpp | |
parent | b5831edec2459c116056ad2d6c86636ffaf34af0 (diff) | |
download | sink-b9e5ac84bd7f81473a87eee9dad6c75fdda7e62e.tar.gz sink-b9e5ac84bd7f81473a87eee9dad6c75fdda7e62e.zip |
Compile with flatbuffers 1.1
Diffstat (limited to 'common/entitybuffer.cpp')
-rw-r--r-- | common/entitybuffer.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/common/entitybuffer.cpp b/common/entitybuffer.cpp index b555ac3..33a52fd 100644 --- a/common/entitybuffer.cpp +++ b/common/entitybuffer.cpp | |||
@@ -60,12 +60,10 @@ flatbuffers::Offset<flatbuffers::Vector<uint8_t> > EntityBuffer::appendAsVector( | |||
60 | { | 60 | { |
61 | //Since we do memcpy trickery, this will only work on little endian | 61 | //Since we do memcpy trickery, this will only work on little endian |
62 | assert(FLATBUFFERS_LITTLEENDIAN); | 62 | assert(FLATBUFFERS_LITTLEENDIAN); |
63 | auto metadata = fbb.CreateUninitializedVector<uint8_t>(size); | 63 | uint8_t *rawDataPtr = Q_NULLPTR; |
64 | { | 64 | const auto pos = fbb.CreateUninitializedVector<uint8_t>(size, &rawDataPtr); |
65 | auto ptr = reinterpret_cast<flatbuffers::Vector<uint8_t> *>(fbb.GetBufferPointer())->Data(); | 65 | std::memcpy((void*)rawDataPtr, data, size); |
66 | std::memcpy((void*)ptr, data, size); | 66 | return pos; |
67 | } | ||
68 | return metadata; | ||
69 | } | 67 | } |
70 | 68 | ||
71 | void EntityBuffer::assembleEntityBuffer(flatbuffers::FlatBufferBuilder &fbb, void const *metadataData, size_t metadataSize, void const *resourceData, size_t resourceSize, void const *localData, size_t localSize) | 69 | void EntityBuffer::assembleEntityBuffer(flatbuffers::FlatBufferBuilder &fbb, void const *metadataData, size_t metadataSize, void const *resourceData, size_t resourceSize, void const *localData, size_t localSize) |