diff --git a/include/flatbuffers/reflection_generated.h b/include/flatbuffers/reflection_generated.h index 4fac4d1d5..3bd1590f6 100644 --- a/include/flatbuffers/reflection_generated.h +++ b/include/flatbuffers/reflection_generated.h @@ -133,7 +133,7 @@ inline flatbuffers::Offset CreateKeyValue(flatbuffers::FlatBufferBuild return builder_.Finish(); } -inline flatbuffers::Offset CreateKeyValue(flatbuffers::FlatBufferBuilder &_fbb, +inline flatbuffers::Offset CreateKeyValueDirect(flatbuffers::FlatBufferBuilder &_fbb, const char *key = nullptr, const char *value = nullptr) { return CreateKeyValue(_fbb, key ? _fbb.CreateString(key) : 0, value ? _fbb.CreateString(value) : 0); @@ -187,7 +187,7 @@ inline flatbuffers::Offset CreateEnumVal(flatbuffers::FlatBufferBuilder return builder_.Finish(); } -inline flatbuffers::Offset CreateEnumVal(flatbuffers::FlatBufferBuilder &_fbb, +inline flatbuffers::Offset CreateEnumValDirect(flatbuffers::FlatBufferBuilder &_fbb, const char *name = nullptr, int64_t value = 0, flatbuffers::Offset object = 0) { @@ -260,7 +260,7 @@ inline flatbuffers::Offset CreateEnum(flatbuffers::FlatBufferBuilder &_fbb return builder_.Finish(); } -inline flatbuffers::Offset CreateEnum(flatbuffers::FlatBufferBuilder &_fbb, +inline flatbuffers::Offset CreateEnumDirect(flatbuffers::FlatBufferBuilder &_fbb, const char *name = nullptr, const std::vector> *values = nullptr, bool is_union = false, @@ -362,7 +362,7 @@ inline flatbuffers::Offset CreateField(flatbuffers::FlatBufferBuilder &_f return builder_.Finish(); } -inline flatbuffers::Offset CreateField(flatbuffers::FlatBufferBuilder &_fbb, +inline flatbuffers::Offset CreateFieldDirect(flatbuffers::FlatBufferBuilder &_fbb, const char *name = nullptr, flatbuffers::Offset type = 0, uint16_t id = 0, @@ -446,7 +446,7 @@ inline flatbuffers::Offset CreateObject(flatbuffers::FlatBufferBuilder & return builder_.Finish(); } -inline flatbuffers::Offset CreateObject(flatbuffers::FlatBufferBuilder &_fbb, +inline flatbuffers::Offset CreateObjectDirect(flatbuffers::FlatBufferBuilder &_fbb, const char *name = nullptr, const std::vector> *fields = nullptr, bool is_struct = false, @@ -520,7 +520,7 @@ inline flatbuffers::Offset CreateSchema(flatbuffers::FlatBufferBuilder & return builder_.Finish(); } -inline flatbuffers::Offset CreateSchema(flatbuffers::FlatBufferBuilder &_fbb, +inline flatbuffers::Offset CreateSchemaDirect(flatbuffers::FlatBufferBuilder &_fbb, const std::vector> *objects = nullptr, const std::vector> *enums = nullptr, const char *file_ident = nullptr, diff --git a/samples/monster_generated.h b/samples/monster_generated.h index 60a8d3f61..84e56224f 100644 --- a/samples/monster_generated.h +++ b/samples/monster_generated.h @@ -188,7 +188,7 @@ inline flatbuffers::Offset CreateMonster(flatbuffers::FlatBufferBuilder return builder_.Finish(); } -inline flatbuffers::Offset CreateMonster(flatbuffers::FlatBufferBuilder &_fbb, +inline flatbuffers::Offset CreateMonsterDirect(flatbuffers::FlatBufferBuilder &_fbb, const Vec3 *pos = 0, int16_t mana = 150, int16_t hp = 100, @@ -249,7 +249,7 @@ inline flatbuffers::Offset CreateWeapon(flatbuffers::FlatBufferBuilder & return builder_.Finish(); } -inline flatbuffers::Offset CreateWeapon(flatbuffers::FlatBufferBuilder &_fbb, +inline flatbuffers::Offset CreateWeaponDirect(flatbuffers::FlatBufferBuilder &_fbb, const char *name = nullptr, int16_t damage = 0) { return CreateWeapon(_fbb, name ? _fbb.CreateString(name) : 0, damage); diff --git a/src/idl_gen_cpp.cpp b/src/idl_gen_cpp.cpp index 9326dd896..edb14cc6b 100644 --- a/src/idl_gen_cpp.cpp +++ b/src/idl_gen_cpp.cpp @@ -897,11 +897,11 @@ class CppGenerator : public BaseGenerator { } code += " return builder_.Finish();\n}\n\n"; - // Generate a CreateX function with vector types as parameters + // Generate a CreateXDirect function with vector types as parameters if (gen_vector_pars) { code += "inline flatbuffers::Offset<" + struct_def.name + "> Create"; code += struct_def.name; - code += "(flatbuffers::FlatBufferBuilder &_fbb"; + code += "Direct(flatbuffers::FlatBufferBuilder &_fbb"; for (auto it = struct_def.fields.vec.begin(); it != struct_def.fields.vec.end(); ++it) { auto &field = **it; diff --git a/tests/monster_test_generated.h b/tests/monster_test_generated.h index 6353658b6..bb37b9536 100644 --- a/tests/monster_test_generated.h +++ b/tests/monster_test_generated.h @@ -260,7 +260,7 @@ inline flatbuffers::Offset CreateStat(flatbuffers::FlatBufferBuilder &_fbb return builder_.Finish(); } -inline flatbuffers::Offset CreateStat(flatbuffers::FlatBufferBuilder &_fbb, +inline flatbuffers::Offset CreateStatDirect(flatbuffers::FlatBufferBuilder &_fbb, const char *id = nullptr, int64_t val = 0, uint16_t count = 0) { @@ -542,7 +542,7 @@ inline flatbuffers::Offset CreateMonster(flatbuffers::FlatBufferBuilder return builder_.Finish(); } -inline flatbuffers::Offset CreateMonster(flatbuffers::FlatBufferBuilder &_fbb, +inline flatbuffers::Offset CreateMonsterDirect(flatbuffers::FlatBufferBuilder &_fbb, const Vec3 *pos = 0, int16_t mana = 150, int16_t hp = 100,