mirror of
https://github.com/google/flatbuffers.git
synced 2026-06-19 20:15:42 +00:00
Re-added Evolution Schema Code Generation Command (#5999)
* Fixed refractoring issue in reflection/generate_code.sh. Also, mv deletes the original file, so I don't need to clean it up manually in that case. * Fixed Dart Tests by removing code-gen for included files. * Added code gen for evolution tests back in. * General generate code and clang format * Added evolution schema generation to .bat file * Added code gen for evolution tests back in. * General generate code and clang format * Added evolution schema generation to .bat file * reran generate_code.sh * Removed wildcard from generate_code.bat that doesn't work
This commit is contained in:
@@ -1681,9 +1681,7 @@ class CppGenerator : public BaseGenerator {
|
||||
code_.SetValue("NATIVE_NAME",
|
||||
NativeName(Name(struct_def), &struct_def, opts_));
|
||||
// In >= C++11, default member initializers are generated.
|
||||
if (opts_.g_cpp_std >= cpp::CPP_STD_11) {
|
||||
return;
|
||||
}
|
||||
if (opts_.g_cpp_std >= cpp::CPP_STD_11) { return; }
|
||||
std::string initializer_list;
|
||||
for (auto it = struct_def.fields.vec.begin();
|
||||
it != struct_def.fields.vec.end(); ++it) {
|
||||
|
||||
@@ -880,9 +880,7 @@ CheckedError Parser::ParseField(StructDef &struct_def) {
|
||||
}
|
||||
// if this field is a union that is deprecated,
|
||||
// the automatically added type field should be deprecated as well
|
||||
if (field->deprecated) {
|
||||
typefield->deprecated = true;
|
||||
}
|
||||
if (field->deprecated) { typefield->deprecated = true; }
|
||||
}
|
||||
|
||||
EXPECT(';');
|
||||
@@ -2181,7 +2179,8 @@ CheckedError Parser::ParseEnum(const bool is_union, EnumDef **dest) {
|
||||
if (prev_ev->GetAsUInt64() == ev->GetAsUInt64())
|
||||
return Error("all enum values must be unique: " + prev_ev->name +
|
||||
" and " + ev->name + " are both " +
|
||||
NumToString(ev->GetAsInt64())); }
|
||||
NumToString(ev->GetAsInt64()));
|
||||
}
|
||||
|
||||
if (dest) *dest = enum_def;
|
||||
types_.Add(current_namespace_->GetFullyQualifiedName(enum_def->name),
|
||||
|
||||
Reference in New Issue
Block a user