summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Vrátil <dvratil@redhat.com>2015-04-10 18:00:21 +0200
committerDan Vrátil <dvratil@redhat.com>2015-04-10 18:00:21 +0200
commit9dc9df290f62b89023a02fe1124bcfbd979d5473 (patch)
tree8b075e02a9bee40081c920243a9a142fae2b5f52
parentf87c777c3c9e4fe9ca4c685363db572f1dce25e2 (diff)
downloadsink-9dc9df290f62b89023a02fe1124bcfbd979d5473.tar.gz
sink-9dc9df290f62b89023a02fe1124bcfbd979d5473.zip
Fix build (flatbuffers API changed)
-rw-r--r--dummyresource/resourcefactory.cpp5
-rw-r--r--tests/storagebenchmark.cpp5
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()
77 static flatbuffers::FlatBufferBuilder fbb; 77 static flatbuffers::FlatBufferBuilder fbb;
78 fbb.Clear(); 78 fbb.Clear();
79 { 79 {
80 uint8_t *rawDataPtr = Q_NULLPTR;
80 auto summary = fbb.CreateString("summary"); 81 auto summary = fbb.CreateString("summary");
81 auto data = fbb.CreateUninitializedVector<uint8_t>(attachmentSize); 82 auto data = fbb.CreateUninitializedVector<uint8_t>(attachmentSize, &rawDataPtr);
82 DummyCalendar::DummyEventBuilder eventBuilder(fbb); 83 DummyCalendar::DummyEventBuilder eventBuilder(fbb);
83 eventBuilder.add_summary(summary); 84 eventBuilder.add_summary(summary);
84 eventBuilder.add_attachment(data); 85 eventBuilder.add_attachment(data);
85 auto eventLocation = eventBuilder.Finish(); 86 auto eventLocation = eventBuilder.Finish();
86 DummyCalendar::FinishDummyEventBuffer(fbb, eventLocation); 87 DummyCalendar::FinishDummyEventBuffer(fbb, eventLocation);
87 memcpy((void*)DummyCalendar::GetDummyEvent(fbb.GetBufferPointer())->attachment()->Data(), rawData, attachmentSize); 88 memcpy((void*)rawDataPtr, rawData, attachmentSize);
88 } 89 }
89 90
90 return std::string(reinterpret_cast<const char *>(fbb.GetBufferPointer()), fbb.GetSize()); 91 return std::string(reinterpret_cast<const char *>(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()
22 static FlatBufferBuilder fbb; 22 static FlatBufferBuilder fbb;
23 fbb.Clear(); 23 fbb.Clear();
24 { 24 {
25 uint8_t *rawDataPtr = Q_NULLPTR;
25 auto summary = fbb.CreateString("summary"); 26 auto summary = fbb.CreateString("summary");
26 auto data = fbb.CreateUninitializedVector<uint8_t>(attachmentSize); 27 auto data = fbb.CreateUninitializedVector<uint8_t>(attachmentSize, &rawDataPtr);
27 //auto data = fbb.CreateVector(rawData, attachmentSize); 28 //auto data = fbb.CreateVector(rawData, attachmentSize);
28 Calendar::EventBuilder eventBuilder(fbb); 29 Calendar::EventBuilder eventBuilder(fbb);
29 eventBuilder.add_summary(summary); 30 eventBuilder.add_summary(summary);
30 eventBuilder.add_attachment(data); 31 eventBuilder.add_attachment(data);
31 auto eventLocation = eventBuilder.Finish(); 32 auto eventLocation = eventBuilder.Finish();
32 Calendar::FinishEventBuffer(fbb, eventLocation); 33 Calendar::FinishEventBuffer(fbb, eventLocation);
33 memcpy((void*)Calendar::GetEvent(fbb.GetBufferPointer())->attachment()->Data(), rawData, attachmentSize); 34 memcpy((void*)rawDataPtr, rawData, attachmentSize);
34 } 35 }
35 36
36 return QByteArray::fromRawData(reinterpret_cast<const char *>(fbb.GetBufferPointer()), fbb.GetSize()); 37 return QByteArray::fromRawData(reinterpret_cast<const char *>(fbb.GetBufferPointer()), fbb.GetSize());