Merge commit '6dccd64de51ea960cb6f0d975768c874814b4c75' into HEAD
Update flatbuffers. Relevant merge tasks:
* A field got added to reflection.fbs; this had fallout in
reflection_generated.h and the logger_test shas.
* Resolved merge conflict in rust/flatbuffers/src/lib.rs
* Reverted upstream change that made Table rust struct members private.
* FlatBufferBuilder Create*Vector calls now include alignment.
* nim codegen got added; needed to update to use scoped enums.
Main fix that motivated this update is
https://github.com/google/flatbuffers/pull/7588
Change-Id: I6bbe5d56846f426fa5f2a82c4f2bc77be2b93bb0
Signed-off-by: James Kuszmaul <james.kuszmaul@bluerivertech.com>
diff --git a/aos/json_to_flatbuffer.cc b/aos/json_to_flatbuffer.cc
index e7b62d4..825bb3c 100644
--- a/aos/json_to_flatbuffer.cc
+++ b/aos/json_to_flatbuffer.cc
@@ -580,8 +580,9 @@
bool JsonParser::FinishVector(int field_index) {
// Vectors have a start (unfortunately which needs to know the size)
- fbb_->StartVector(stack_.back().vector_elements.size(),
- stack_.back().type.FieldInlineSize(field_index));
+ const size_t inline_size = stack_.back().type.FieldInlineSize(field_index);
+ fbb_->StartVector(stack_.back().vector_elements.size(), inline_size,
+ /*align=*/inline_size);
const flatbuffers::ElementaryType elementary_type =
stack_.back().type.FieldElementaryType(field_index);