Flatbuffers Merge commit '8cd6f0538a362ceefbcfcbf6c7b8b3f341d1fb41' into master
Upgrade flatbuffers to the latest.
Change-Id: I901787ac6fc5d7ce2c4019cc0d275de68086b4d8
diff --git a/aos/json_to_flatbuffer.cc b/aos/json_to_flatbuffer.cc
index d78fe99..f12014f 100644
--- a/aos/json_to_flatbuffer.cc
+++ b/aos/json_to_flatbuffer.cc
@@ -354,7 +354,7 @@
flatbuffers::TypeCode type_code =
stack_.back().typetable->type_codes[field_index];
- if (type_code.is_vector != in_vector()) {
+ if (type_code.is_repeating != in_vector()) {
fprintf(stderr, "Type and json disagree on if we are in a vector or not\n");
return false;
}
@@ -371,7 +371,7 @@
flatbuffers::TypeCode type_code =
stack_.back().typetable->type_codes[field_index];
- if (type_code.is_vector != in_vector()) {
+ if (type_code.is_repeating != in_vector()) {
fprintf(stderr, "Type and json disagree on if we are in a vector or not\n");
return false;
}
@@ -388,7 +388,7 @@
flatbuffers::TypeCode type_code =
stack_.back().typetable->type_codes[field_index];
- if (type_code.is_vector != in_vector()) {
+ if (type_code.is_repeating != in_vector()) {
fprintf(stderr, "Type and json disagree on if we are in a vector or not\n");
return false;
}
@@ -581,7 +581,7 @@
static_cast<flatbuffers::voffset_t>(field_index));
// Vectors will always be Offset<>'s.
- if (type_code.is_vector) {
+ if (type_code.is_repeating) {
fbb->AddOffset(field_offset, offset_element);
return true;
}
@@ -809,10 +809,10 @@
to_string_.EndSequence();
}
void Field(size_t field_idx, size_t set_idx, flatbuffers::ElementaryType type,
- bool is_vector, const flatbuffers::TypeTable *type_table,
+ bool is_repeating, const flatbuffers::TypeTable *type_table,
const char *name, const uint8_t *val) override {
if (should_skip()) return;
- to_string_.Field(field_idx, set_idx, type, is_vector, type_table, name,
+ to_string_.Field(field_idx, set_idx, type, is_repeating, type_table, name,
val);
}
void UType(uint8_t value, const char *name) override {