From 9dc9df290f62b89023a02fe1124bcfbd979d5473 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Vr=C3=A1til?= Date: Fri, 10 Apr 2015 18:00:21 +0200 Subject: Fix build (flatbuffers API changed) --- dummyresource/resourcefactory.cpp | 5 +++-- tests/storagebenchmark.cpp | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dummyresource/resourcefactory.cpp b/dummyresource/resourcefactory.cpp index 6e06250..dda34ef 100644 --- a/dummyresource/resourcefactory.cpp +++ b/dummyresource/resourcefactory.cpp @@ -77,14 +77,15 @@ static std::string createEvent() static flatbuffers::FlatBufferBuilder fbb; fbb.Clear(); { + uint8_t *rawDataPtr = Q_NULLPTR; auto summary = fbb.CreateString("summary"); - auto data = fbb.CreateUninitializedVector(attachmentSize); + auto data = fbb.CreateUninitializedVector(attachmentSize, &rawDataPtr); DummyCalendar::DummyEventBuilder eventBuilder(fbb); eventBuilder.add_summary(summary); eventBuilder.add_attachment(data); auto eventLocation = eventBuilder.Finish(); DummyCalendar::FinishDummyEventBuffer(fbb, eventLocation); - memcpy((void*)DummyCalendar::GetDummyEvent(fbb.GetBufferPointer())->attachment()->Data(), rawData, attachmentSize); + memcpy((void*)rawDataPtr, rawData, attachmentSize); } return std::string(reinterpret_cast(fbb.GetBufferPointer()), fbb.GetSize()); diff --git a/tests/storagebenchmark.cpp b/tests/storagebenchmark.cpp index 0233466..503c3b9 100644 --- a/tests/storagebenchmark.cpp +++ b/tests/storagebenchmark.cpp @@ -22,15 +22,16 @@ static QByteArray createEvent() static FlatBufferBuilder fbb; fbb.Clear(); { + uint8_t *rawDataPtr = Q_NULLPTR; auto summary = fbb.CreateString("summary"); - auto data = fbb.CreateUninitializedVector(attachmentSize); + auto data = fbb.CreateUninitializedVector(attachmentSize, &rawDataPtr); //auto data = fbb.CreateVector(rawData, attachmentSize); Calendar::EventBuilder eventBuilder(fbb); eventBuilder.add_summary(summary); eventBuilder.add_attachment(data); auto eventLocation = eventBuilder.Finish(); Calendar::FinishEventBuffer(fbb, eventLocation); - memcpy((void*)Calendar::GetEvent(fbb.GetBufferPointer())->attachment()->Data(), rawData, attachmentSize); + memcpy((void*)rawDataPtr, rawData, attachmentSize); } return QByteArray::fromRawData(reinterpret_cast(fbb.GetBufferPointer()), fbb.GetSize()); -- cgit v1.2.3