diff --git a/include/flatbuffers/code_generators.h b/include/flatbuffers/code_generators.h index 3128f17a7..33307750d 100644 --- a/include/flatbuffers/code_generators.h +++ b/include/flatbuffers/code_generators.h @@ -109,8 +109,9 @@ class BaseGenerator { // which works for js and php virtual const Namespace *CurrentNameSpace() const { return nullptr; } - // Ensure that a type is prefixed with its namespace whenever it is used - // outside of its namespace. + // Ensure that a type is prefixed with its namespace even within + // its own namespace to avoid conflict between generated method + // names and similarly named classes or structs std::string WrapInNameSpace(const Namespace *ns, const std::string &name) const; diff --git a/include/flatbuffers/reflection_generated.h b/include/flatbuffers/reflection_generated.h index 55ab79cc3..47a8a0c2d 100644 --- a/include/flatbuffers/reflection_generated.h +++ b/include/flatbuffers/reflection_generated.h @@ -105,11 +105,11 @@ struct Type FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { VT_ELEMENT = 6, VT_INDEX = 8 }; - BaseType base_type() const { - return static_cast(GetField(VT_BASE_TYPE, 0)); + reflection::BaseType base_type() const { + return static_cast(GetField(VT_BASE_TYPE, 0)); } - BaseType element() const { - return static_cast(GetField(VT_ELEMENT, 0)); + reflection::BaseType element() const { + return static_cast(GetField(VT_ELEMENT, 0)); } int32_t index() const { return GetField(VT_INDEX, -1); @@ -126,10 +126,10 @@ struct Type FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { struct TypeBuilder { flatbuffers::FlatBufferBuilder &fbb_; flatbuffers::uoffset_t start_; - void add_base_type(BaseType base_type) { + void add_base_type(reflection::BaseType base_type) { fbb_.AddElement(Type::VT_BASE_TYPE, static_cast(base_type), 0); } - void add_element(BaseType element) { + void add_element(reflection::BaseType element) { fbb_.AddElement(Type::VT_ELEMENT, static_cast(element), 0); } void add_index(int32_t index) { @@ -149,8 +149,8 @@ struct TypeBuilder { inline flatbuffers::Offset CreateType( flatbuffers::FlatBufferBuilder &_fbb, - BaseType base_type = None, - BaseType element = None, + reflection::BaseType base_type = reflection::None, + reflection::BaseType element = reflection::None, int32_t index = -1) { TypeBuilder builder_(_fbb); builder_.add_index(index); @@ -250,11 +250,11 @@ struct EnumVal FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { int KeyCompareWithValue(int64_t val) const { return static_cast(value() > val) - static_cast(value() < val); } - const Object *object() const { - return GetPointer(VT_OBJECT); + const reflection::Object *object() const { + return GetPointer(VT_OBJECT); } - const Type *union_type() const { - return GetPointer(VT_UNION_TYPE); + const reflection::Type *union_type() const { + return GetPointer(VT_UNION_TYPE); } const flatbuffers::Vector> *documentation() const { return GetPointer> *>(VT_DOCUMENTATION); @@ -284,10 +284,10 @@ struct EnumValBuilder { void add_value(int64_t value) { fbb_.AddElement(EnumVal::VT_VALUE, value, 0); } - void add_object(flatbuffers::Offset object) { + void add_object(flatbuffers::Offset object) { fbb_.AddOffset(EnumVal::VT_OBJECT, object); } - void add_union_type(flatbuffers::Offset union_type) { + void add_union_type(flatbuffers::Offset union_type) { fbb_.AddOffset(EnumVal::VT_UNION_TYPE, union_type); } void add_documentation(flatbuffers::Offset>> documentation) { @@ -310,8 +310,8 @@ inline flatbuffers::Offset CreateEnumVal( flatbuffers::FlatBufferBuilder &_fbb, flatbuffers::Offset name = 0, int64_t value = 0, - flatbuffers::Offset object = 0, - flatbuffers::Offset union_type = 0, + flatbuffers::Offset object = 0, + flatbuffers::Offset union_type = 0, flatbuffers::Offset>> documentation = 0) { EnumValBuilder builder_(_fbb); builder_.add_value(value); @@ -326,8 +326,8 @@ inline flatbuffers::Offset CreateEnumValDirect( flatbuffers::FlatBufferBuilder &_fbb, const char *name = nullptr, int64_t value = 0, - flatbuffers::Offset object = 0, - flatbuffers::Offset union_type = 0, + flatbuffers::Offset object = 0, + flatbuffers::Offset union_type = 0, const std::vector> *documentation = nullptr) { auto name__ = name ? _fbb.CreateString(name) : 0; auto documentation__ = documentation ? _fbb.CreateVector>(*documentation) : 0; @@ -358,17 +358,17 @@ struct Enum FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { int KeyCompareWithValue(const char *val) const { return strcmp(name()->c_str(), val); } - const flatbuffers::Vector> *values() const { - return GetPointer> *>(VT_VALUES); + const flatbuffers::Vector> *values() const { + return GetPointer> *>(VT_VALUES); } bool is_union() const { return GetField(VT_IS_UNION, 0) != 0; } - const Type *underlying_type() const { - return GetPointer(VT_UNDERLYING_TYPE); + const reflection::Type *underlying_type() const { + return GetPointer(VT_UNDERLYING_TYPE); } - const flatbuffers::Vector> *attributes() const { - return GetPointer> *>(VT_ATTRIBUTES); + const flatbuffers::Vector> *attributes() const { + return GetPointer> *>(VT_ATTRIBUTES); } const flatbuffers::Vector> *documentation() const { return GetPointer> *>(VT_DOCUMENTATION); @@ -399,16 +399,16 @@ struct EnumBuilder { void add_name(flatbuffers::Offset name) { fbb_.AddOffset(Enum::VT_NAME, name); } - void add_values(flatbuffers::Offset>> values) { + void add_values(flatbuffers::Offset>> values) { fbb_.AddOffset(Enum::VT_VALUES, values); } void add_is_union(bool is_union) { fbb_.AddElement(Enum::VT_IS_UNION, static_cast(is_union), 0); } - void add_underlying_type(flatbuffers::Offset underlying_type) { + void add_underlying_type(flatbuffers::Offset underlying_type) { fbb_.AddOffset(Enum::VT_UNDERLYING_TYPE, underlying_type); } - void add_attributes(flatbuffers::Offset>> attributes) { + void add_attributes(flatbuffers::Offset>> attributes) { fbb_.AddOffset(Enum::VT_ATTRIBUTES, attributes); } void add_documentation(flatbuffers::Offset>> documentation) { @@ -432,10 +432,10 @@ struct EnumBuilder { inline flatbuffers::Offset CreateEnum( flatbuffers::FlatBufferBuilder &_fbb, flatbuffers::Offset name = 0, - flatbuffers::Offset>> values = 0, + flatbuffers::Offset>> values = 0, bool is_union = false, - flatbuffers::Offset underlying_type = 0, - flatbuffers::Offset>> attributes = 0, + flatbuffers::Offset underlying_type = 0, + flatbuffers::Offset>> attributes = 0, flatbuffers::Offset>> documentation = 0) { EnumBuilder builder_(_fbb); builder_.add_documentation(documentation); @@ -450,14 +450,14 @@ inline flatbuffers::Offset CreateEnum( inline flatbuffers::Offset CreateEnumDirect( flatbuffers::FlatBufferBuilder &_fbb, const char *name = nullptr, - const std::vector> *values = nullptr, + const std::vector> *values = nullptr, bool is_union = false, - flatbuffers::Offset underlying_type = 0, - const std::vector> *attributes = nullptr, + flatbuffers::Offset underlying_type = 0, + const std::vector> *attributes = nullptr, const std::vector> *documentation = nullptr) { auto name__ = name ? _fbb.CreateString(name) : 0; - auto values__ = values ? _fbb.CreateVector>(*values) : 0; - auto attributes__ = attributes ? _fbb.CreateVector>(*attributes) : 0; + auto values__ = values ? _fbb.CreateVector>(*values) : 0; + auto attributes__ = attributes ? _fbb.CreateVector>(*attributes) : 0; auto documentation__ = documentation ? _fbb.CreateVector>(*documentation) : 0; return reflection::CreateEnum( _fbb, @@ -492,8 +492,8 @@ struct Field FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { int KeyCompareWithValue(const char *val) const { return strcmp(name()->c_str(), val); } - const Type *type() const { - return GetPointer(VT_TYPE); + const reflection::Type *type() const { + return GetPointer(VT_TYPE); } uint16_t id() const { return GetField(VT_ID, 0); @@ -516,8 +516,8 @@ struct Field FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { bool key() const { return GetField(VT_KEY, 0) != 0; } - const flatbuffers::Vector> *attributes() const { - return GetPointer> *>(VT_ATTRIBUTES); + const flatbuffers::Vector> *attributes() const { + return GetPointer> *>(VT_ATTRIBUTES); } const flatbuffers::Vector> *documentation() const { return GetPointer> *>(VT_DOCUMENTATION); @@ -551,7 +551,7 @@ struct FieldBuilder { void add_name(flatbuffers::Offset name) { fbb_.AddOffset(Field::VT_NAME, name); } - void add_type(flatbuffers::Offset type) { + void add_type(flatbuffers::Offset type) { fbb_.AddOffset(Field::VT_TYPE, type); } void add_id(uint16_t id) { @@ -575,7 +575,7 @@ struct FieldBuilder { void add_key(bool key) { fbb_.AddElement(Field::VT_KEY, static_cast(key), 0); } - void add_attributes(flatbuffers::Offset>> attributes) { + void add_attributes(flatbuffers::Offset>> attributes) { fbb_.AddOffset(Field::VT_ATTRIBUTES, attributes); } void add_documentation(flatbuffers::Offset>> documentation) { @@ -598,7 +598,7 @@ struct FieldBuilder { inline flatbuffers::Offset CreateField( flatbuffers::FlatBufferBuilder &_fbb, flatbuffers::Offset name = 0, - flatbuffers::Offset type = 0, + flatbuffers::Offset type = 0, uint16_t id = 0, uint16_t offset = 0, int64_t default_integer = 0, @@ -606,7 +606,7 @@ inline flatbuffers::Offset CreateField( bool deprecated = false, bool required = false, bool key = false, - flatbuffers::Offset>> attributes = 0, + flatbuffers::Offset>> attributes = 0, flatbuffers::Offset>> documentation = 0) { FieldBuilder builder_(_fbb); builder_.add_default_real(default_real); @@ -626,7 +626,7 @@ inline flatbuffers::Offset CreateField( inline flatbuffers::Offset CreateFieldDirect( flatbuffers::FlatBufferBuilder &_fbb, const char *name = nullptr, - flatbuffers::Offset type = 0, + flatbuffers::Offset type = 0, uint16_t id = 0, uint16_t offset = 0, int64_t default_integer = 0, @@ -634,10 +634,10 @@ inline flatbuffers::Offset CreateFieldDirect( bool deprecated = false, bool required = false, bool key = false, - const std::vector> *attributes = nullptr, + const std::vector> *attributes = nullptr, const std::vector> *documentation = nullptr) { auto name__ = name ? _fbb.CreateString(name) : 0; - auto attributes__ = attributes ? _fbb.CreateVector>(*attributes) : 0; + auto attributes__ = attributes ? _fbb.CreateVector>(*attributes) : 0; auto documentation__ = documentation ? _fbb.CreateVector>(*documentation) : 0; return reflection::CreateField( _fbb, @@ -673,8 +673,8 @@ struct Object FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { int KeyCompareWithValue(const char *val) const { return strcmp(name()->c_str(), val); } - const flatbuffers::Vector> *fields() const { - return GetPointer> *>(VT_FIELDS); + const flatbuffers::Vector> *fields() const { + return GetPointer> *>(VT_FIELDS); } bool is_struct() const { return GetField(VT_IS_STRUCT, 0) != 0; @@ -685,8 +685,8 @@ struct Object FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { int32_t bytesize() const { return GetField(VT_BYTESIZE, 0); } - const flatbuffers::Vector> *attributes() const { - return GetPointer> *>(VT_ATTRIBUTES); + const flatbuffers::Vector> *attributes() const { + return GetPointer> *>(VT_ATTRIBUTES); } const flatbuffers::Vector> *documentation() const { return GetPointer> *>(VT_DOCUMENTATION); @@ -717,7 +717,7 @@ struct ObjectBuilder { void add_name(flatbuffers::Offset name) { fbb_.AddOffset(Object::VT_NAME, name); } - void add_fields(flatbuffers::Offset>> fields) { + void add_fields(flatbuffers::Offset>> fields) { fbb_.AddOffset(Object::VT_FIELDS, fields); } void add_is_struct(bool is_struct) { @@ -729,7 +729,7 @@ struct ObjectBuilder { void add_bytesize(int32_t bytesize) { fbb_.AddElement(Object::VT_BYTESIZE, bytesize, 0); } - void add_attributes(flatbuffers::Offset>> attributes) { + void add_attributes(flatbuffers::Offset>> attributes) { fbb_.AddOffset(Object::VT_ATTRIBUTES, attributes); } void add_documentation(flatbuffers::Offset>> documentation) { @@ -752,11 +752,11 @@ struct ObjectBuilder { inline flatbuffers::Offset CreateObject( flatbuffers::FlatBufferBuilder &_fbb, flatbuffers::Offset name = 0, - flatbuffers::Offset>> fields = 0, + flatbuffers::Offset>> fields = 0, bool is_struct = false, int32_t minalign = 0, int32_t bytesize = 0, - flatbuffers::Offset>> attributes = 0, + flatbuffers::Offset>> attributes = 0, flatbuffers::Offset>> documentation = 0) { ObjectBuilder builder_(_fbb); builder_.add_documentation(documentation); @@ -772,15 +772,15 @@ inline flatbuffers::Offset CreateObject( inline flatbuffers::Offset CreateObjectDirect( flatbuffers::FlatBufferBuilder &_fbb, const char *name = nullptr, - const std::vector> *fields = nullptr, + const std::vector> *fields = nullptr, bool is_struct = false, int32_t minalign = 0, int32_t bytesize = 0, - const std::vector> *attributes = nullptr, + const std::vector> *attributes = nullptr, const std::vector> *documentation = nullptr) { auto name__ = name ? _fbb.CreateString(name) : 0; - auto fields__ = fields ? _fbb.CreateVector>(*fields) : 0; - auto attributes__ = attributes ? _fbb.CreateVector>(*attributes) : 0; + auto fields__ = fields ? _fbb.CreateVector>(*fields) : 0; + auto attributes__ = attributes ? _fbb.CreateVector>(*attributes) : 0; auto documentation__ = documentation ? _fbb.CreateVector>(*documentation) : 0; return reflection::CreateObject( _fbb, @@ -810,14 +810,14 @@ struct RPCCall FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { int KeyCompareWithValue(const char *val) const { return strcmp(name()->c_str(), val); } - const Object *request() const { - return GetPointer(VT_REQUEST); + const reflection::Object *request() const { + return GetPointer(VT_REQUEST); } - const Object *response() const { - return GetPointer(VT_RESPONSE); + const reflection::Object *response() const { + return GetPointer(VT_RESPONSE); } - const flatbuffers::Vector> *attributes() const { - return GetPointer> *>(VT_ATTRIBUTES); + const flatbuffers::Vector> *attributes() const { + return GetPointer> *>(VT_ATTRIBUTES); } const flatbuffers::Vector> *documentation() const { return GetPointer> *>(VT_DOCUMENTATION); @@ -846,13 +846,13 @@ struct RPCCallBuilder { void add_name(flatbuffers::Offset name) { fbb_.AddOffset(RPCCall::VT_NAME, name); } - void add_request(flatbuffers::Offset request) { + void add_request(flatbuffers::Offset request) { fbb_.AddOffset(RPCCall::VT_REQUEST, request); } - void add_response(flatbuffers::Offset response) { + void add_response(flatbuffers::Offset response) { fbb_.AddOffset(RPCCall::VT_RESPONSE, response); } - void add_attributes(flatbuffers::Offset>> attributes) { + void add_attributes(flatbuffers::Offset>> attributes) { fbb_.AddOffset(RPCCall::VT_ATTRIBUTES, attributes); } void add_documentation(flatbuffers::Offset>> documentation) { @@ -876,9 +876,9 @@ struct RPCCallBuilder { inline flatbuffers::Offset CreateRPCCall( flatbuffers::FlatBufferBuilder &_fbb, flatbuffers::Offset name = 0, - flatbuffers::Offset request = 0, - flatbuffers::Offset response = 0, - flatbuffers::Offset>> attributes = 0, + flatbuffers::Offset request = 0, + flatbuffers::Offset response = 0, + flatbuffers::Offset>> attributes = 0, flatbuffers::Offset>> documentation = 0) { RPCCallBuilder builder_(_fbb); builder_.add_documentation(documentation); @@ -892,12 +892,12 @@ inline flatbuffers::Offset CreateRPCCall( inline flatbuffers::Offset CreateRPCCallDirect( flatbuffers::FlatBufferBuilder &_fbb, const char *name = nullptr, - flatbuffers::Offset request = 0, - flatbuffers::Offset response = 0, - const std::vector> *attributes = nullptr, + flatbuffers::Offset request = 0, + flatbuffers::Offset response = 0, + const std::vector> *attributes = nullptr, const std::vector> *documentation = nullptr) { auto name__ = name ? _fbb.CreateString(name) : 0; - auto attributes__ = attributes ? _fbb.CreateVector>(*attributes) : 0; + auto attributes__ = attributes ? _fbb.CreateVector>(*attributes) : 0; auto documentation__ = documentation ? _fbb.CreateVector>(*documentation) : 0; return reflection::CreateRPCCall( _fbb, @@ -924,11 +924,11 @@ struct Service FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { int KeyCompareWithValue(const char *val) const { return strcmp(name()->c_str(), val); } - const flatbuffers::Vector> *calls() const { - return GetPointer> *>(VT_CALLS); + const flatbuffers::Vector> *calls() const { + return GetPointer> *>(VT_CALLS); } - const flatbuffers::Vector> *attributes() const { - return GetPointer> *>(VT_ATTRIBUTES); + const flatbuffers::Vector> *attributes() const { + return GetPointer> *>(VT_ATTRIBUTES); } const flatbuffers::Vector> *documentation() const { return GetPointer> *>(VT_DOCUMENTATION); @@ -956,10 +956,10 @@ struct ServiceBuilder { void add_name(flatbuffers::Offset name) { fbb_.AddOffset(Service::VT_NAME, name); } - void add_calls(flatbuffers::Offset>> calls) { + void add_calls(flatbuffers::Offset>> calls) { fbb_.AddOffset(Service::VT_CALLS, calls); } - void add_attributes(flatbuffers::Offset>> attributes) { + void add_attributes(flatbuffers::Offset>> attributes) { fbb_.AddOffset(Service::VT_ATTRIBUTES, attributes); } void add_documentation(flatbuffers::Offset>> documentation) { @@ -981,8 +981,8 @@ struct ServiceBuilder { inline flatbuffers::Offset CreateService( flatbuffers::FlatBufferBuilder &_fbb, flatbuffers::Offset name = 0, - flatbuffers::Offset>> calls = 0, - flatbuffers::Offset>> attributes = 0, + flatbuffers::Offset>> calls = 0, + flatbuffers::Offset>> attributes = 0, flatbuffers::Offset>> documentation = 0) { ServiceBuilder builder_(_fbb); builder_.add_documentation(documentation); @@ -995,12 +995,12 @@ inline flatbuffers::Offset CreateService( inline flatbuffers::Offset CreateServiceDirect( flatbuffers::FlatBufferBuilder &_fbb, const char *name = nullptr, - const std::vector> *calls = nullptr, - const std::vector> *attributes = nullptr, + const std::vector> *calls = nullptr, + const std::vector> *attributes = nullptr, const std::vector> *documentation = nullptr) { auto name__ = name ? _fbb.CreateString(name) : 0; - auto calls__ = calls ? _fbb.CreateVector>(*calls) : 0; - auto attributes__ = attributes ? _fbb.CreateVector>(*attributes) : 0; + auto calls__ = calls ? _fbb.CreateVector>(*calls) : 0; + auto attributes__ = attributes ? _fbb.CreateVector>(*attributes) : 0; auto documentation__ = documentation ? _fbb.CreateVector>(*documentation) : 0; return reflection::CreateService( _fbb, @@ -1019,11 +1019,11 @@ struct Schema FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { VT_ROOT_TABLE = 12, VT_SERVICES = 14 }; - const flatbuffers::Vector> *objects() const { - return GetPointer> *>(VT_OBJECTS); + const flatbuffers::Vector> *objects() const { + return GetPointer> *>(VT_OBJECTS); } - const flatbuffers::Vector> *enums() const { - return GetPointer> *>(VT_ENUMS); + const flatbuffers::Vector> *enums() const { + return GetPointer> *>(VT_ENUMS); } const flatbuffers::String *file_ident() const { return GetPointer(VT_FILE_IDENT); @@ -1031,11 +1031,11 @@ struct Schema FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { const flatbuffers::String *file_ext() const { return GetPointer(VT_FILE_EXT); } - const Object *root_table() const { - return GetPointer(VT_ROOT_TABLE); + const reflection::Object *root_table() const { + return GetPointer(VT_ROOT_TABLE); } - const flatbuffers::Vector> *services() const { - return GetPointer> *>(VT_SERVICES); + const flatbuffers::Vector> *services() const { + return GetPointer> *>(VT_SERVICES); } bool Verify(flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && @@ -1061,10 +1061,10 @@ struct Schema FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { struct SchemaBuilder { flatbuffers::FlatBufferBuilder &fbb_; flatbuffers::uoffset_t start_; - void add_objects(flatbuffers::Offset>> objects) { + void add_objects(flatbuffers::Offset>> objects) { fbb_.AddOffset(Schema::VT_OBJECTS, objects); } - void add_enums(flatbuffers::Offset>> enums) { + void add_enums(flatbuffers::Offset>> enums) { fbb_.AddOffset(Schema::VT_ENUMS, enums); } void add_file_ident(flatbuffers::Offset file_ident) { @@ -1073,10 +1073,10 @@ struct SchemaBuilder { void add_file_ext(flatbuffers::Offset file_ext) { fbb_.AddOffset(Schema::VT_FILE_EXT, file_ext); } - void add_root_table(flatbuffers::Offset root_table) { + void add_root_table(flatbuffers::Offset root_table) { fbb_.AddOffset(Schema::VT_ROOT_TABLE, root_table); } - void add_services(flatbuffers::Offset>> services) { + void add_services(flatbuffers::Offset>> services) { fbb_.AddOffset(Schema::VT_SERVICES, services); } explicit SchemaBuilder(flatbuffers::FlatBufferBuilder &_fbb) @@ -1095,12 +1095,12 @@ struct SchemaBuilder { inline flatbuffers::Offset CreateSchema( flatbuffers::FlatBufferBuilder &_fbb, - flatbuffers::Offset>> objects = 0, - flatbuffers::Offset>> enums = 0, + flatbuffers::Offset>> objects = 0, + flatbuffers::Offset>> enums = 0, flatbuffers::Offset file_ident = 0, flatbuffers::Offset file_ext = 0, - flatbuffers::Offset root_table = 0, - flatbuffers::Offset>> services = 0) { + flatbuffers::Offset root_table = 0, + flatbuffers::Offset>> services = 0) { SchemaBuilder builder_(_fbb); builder_.add_services(services); builder_.add_root_table(root_table); @@ -1113,17 +1113,17 @@ inline flatbuffers::Offset CreateSchema( inline flatbuffers::Offset CreateSchemaDirect( flatbuffers::FlatBufferBuilder &_fbb, - const std::vector> *objects = nullptr, - const std::vector> *enums = nullptr, + const std::vector> *objects = nullptr, + const std::vector> *enums = nullptr, const char *file_ident = nullptr, const char *file_ext = nullptr, - flatbuffers::Offset root_table = 0, - const std::vector> *services = nullptr) { - auto objects__ = objects ? _fbb.CreateVector>(*objects) : 0; - auto enums__ = enums ? _fbb.CreateVector>(*enums) : 0; + flatbuffers::Offset root_table = 0, + const std::vector> *services = nullptr) { + auto objects__ = objects ? _fbb.CreateVector>(*objects) : 0; + auto enums__ = enums ? _fbb.CreateVector>(*enums) : 0; auto file_ident__ = file_ident ? _fbb.CreateString(file_ident) : 0; auto file_ext__ = file_ext ? _fbb.CreateString(file_ext) : 0; - auto services__ = services ? _fbb.CreateVector>(*services) : 0; + auto services__ = services ? _fbb.CreateVector>(*services) : 0; return reflection::CreateSchema( _fbb, objects__, diff --git a/samples/monster_generated.h b/samples/monster_generated.h index fd867f24d..30115da9b 100644 --- a/samples/monster_generated.h +++ b/samples/monster_generated.h @@ -97,7 +97,7 @@ template struct EquipmentTraits { static const Equipment enum_value = Equipment_NONE; }; -template<> struct EquipmentTraits { +template<> struct EquipmentTraits { static const Equipment enum_value = Equipment_Weapon; }; @@ -133,13 +133,13 @@ struct EquipmentUnion { static void *UnPack(const void *obj, Equipment type, const flatbuffers::resolver_function_t *resolver); flatbuffers::Offset Pack(flatbuffers::FlatBufferBuilder &_fbb, const flatbuffers::rehasher_function_t *_rehasher = nullptr) const; - WeaponT *AsWeapon() { + MyGame::Sample::WeaponT *AsWeapon() { return type == Equipment_Weapon ? - reinterpret_cast(value) : nullptr; + reinterpret_cast(value) : nullptr; } - const WeaponT *AsWeapon() const { + const MyGame::Sample::WeaponT *AsWeapon() const { return type == Equipment_Weapon ? - reinterpret_cast(value) : nullptr; + reinterpret_cast(value) : nullptr; } }; @@ -151,8 +151,8 @@ inline bool operator==(const EquipmentUnion &lhs, const EquipmentUnion &rhs) { return true; } case Equipment_Weapon: { - return *(reinterpret_cast(lhs.value)) == - *(reinterpret_cast(rhs.value)); + return *(reinterpret_cast(lhs.value)) == + *(reinterpret_cast(rhs.value)); } default: { return false; @@ -220,19 +220,19 @@ inline bool operator!=(const Vec3 &lhs, const Vec3 &rhs) { struct MonsterT : public flatbuffers::NativeTable { typedef Monster TableType; - flatbuffers::unique_ptr pos; + flatbuffers::unique_ptr pos; int16_t mana; int16_t hp; std::string name; std::vector inventory; - Color color; - std::vector> weapons; + MyGame::Sample::Color color; + std::vector> weapons; EquipmentUnion equipped; - std::vector path; + std::vector path; MonsterT() : mana(150), hp(100), - color(Color_Blue) { + color(MyGame::Sample::Color_Blue) { } }; @@ -271,11 +271,11 @@ struct Monster FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { VT_EQUIPPED = 22, VT_PATH = 24 }; - const Vec3 *pos() const { - return GetStruct(VT_POS); + const MyGame::Sample::Vec3 *pos() const { + return GetStruct(VT_POS); } - Vec3 *mutable_pos() { - return GetStruct(VT_POS); + MyGame::Sample::Vec3 *mutable_pos() { + return GetStruct(VT_POS); } int16_t mana() const { return GetField(VT_MANA, 150); @@ -301,43 +301,43 @@ struct Monster FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { flatbuffers::Vector *mutable_inventory() { return GetPointer *>(VT_INVENTORY); } - Color color() const { - return static_cast(GetField(VT_COLOR, 2)); + MyGame::Sample::Color color() const { + return static_cast(GetField(VT_COLOR, 2)); } - bool mutate_color(Color _color) { + bool mutate_color(MyGame::Sample::Color _color) { return SetField(VT_COLOR, static_cast(_color), 2); } - const flatbuffers::Vector> *weapons() const { - return GetPointer> *>(VT_WEAPONS); + const flatbuffers::Vector> *weapons() const { + return GetPointer> *>(VT_WEAPONS); } - flatbuffers::Vector> *mutable_weapons() { - return GetPointer> *>(VT_WEAPONS); + flatbuffers::Vector> *mutable_weapons() { + return GetPointer> *>(VT_WEAPONS); } - Equipment equipped_type() const { - return static_cast(GetField(VT_EQUIPPED_TYPE, 0)); + MyGame::Sample::Equipment equipped_type() const { + return static_cast(GetField(VT_EQUIPPED_TYPE, 0)); } - bool mutate_equipped_type(Equipment _equipped_type) { + bool mutate_equipped_type(MyGame::Sample::Equipment _equipped_type) { return SetField(VT_EQUIPPED_TYPE, static_cast(_equipped_type), 0); } const void *equipped() const { return GetPointer(VT_EQUIPPED); } template const T *equipped_as() const; - const Weapon *equipped_as_Weapon() const { - return equipped_type() == Equipment_Weapon ? static_cast(equipped()) : nullptr; + const MyGame::Sample::Weapon *equipped_as_Weapon() const { + return equipped_type() == MyGame::Sample::Equipment_Weapon ? static_cast(equipped()) : nullptr; } void *mutable_equipped() { return GetPointer(VT_EQUIPPED); } - const flatbuffers::Vector *path() const { - return GetPointer *>(VT_PATH); + const flatbuffers::Vector *path() const { + return GetPointer *>(VT_PATH); } - flatbuffers::Vector *mutable_path() { - return GetPointer *>(VT_PATH); + flatbuffers::Vector *mutable_path() { + return GetPointer *>(VT_PATH); } bool Verify(flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && - VerifyField(verifier, VT_POS) && + VerifyField(verifier, VT_POS) && VerifyField(verifier, VT_MANA) && VerifyField(verifier, VT_HP) && VerifyOffset(verifier, VT_NAME) && @@ -360,14 +360,14 @@ struct Monster FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { static flatbuffers::Offset Pack(flatbuffers::FlatBufferBuilder &_fbb, const MonsterT* _o, const flatbuffers::rehasher_function_t *_rehasher = nullptr); }; -template<> inline const Weapon *Monster::equipped_as() const { +template<> inline const MyGame::Sample::Weapon *Monster::equipped_as() const { return equipped_as_Weapon(); } struct MonsterBuilder { flatbuffers::FlatBufferBuilder &fbb_; flatbuffers::uoffset_t start_; - void add_pos(const Vec3 *pos) { + void add_pos(const MyGame::Sample::Vec3 *pos) { fbb_.AddStruct(Monster::VT_POS, pos); } void add_mana(int16_t mana) { @@ -382,19 +382,19 @@ struct MonsterBuilder { void add_inventory(flatbuffers::Offset> inventory) { fbb_.AddOffset(Monster::VT_INVENTORY, inventory); } - void add_color(Color color) { + void add_color(MyGame::Sample::Color color) { fbb_.AddElement(Monster::VT_COLOR, static_cast(color), 2); } - void add_weapons(flatbuffers::Offset>> weapons) { + void add_weapons(flatbuffers::Offset>> weapons) { fbb_.AddOffset(Monster::VT_WEAPONS, weapons); } - void add_equipped_type(Equipment equipped_type) { + void add_equipped_type(MyGame::Sample::Equipment equipped_type) { fbb_.AddElement(Monster::VT_EQUIPPED_TYPE, static_cast(equipped_type), 0); } void add_equipped(flatbuffers::Offset equipped) { fbb_.AddOffset(Monster::VT_EQUIPPED, equipped); } - void add_path(flatbuffers::Offset> path) { + void add_path(flatbuffers::Offset> path) { fbb_.AddOffset(Monster::VT_PATH, path); } explicit MonsterBuilder(flatbuffers::FlatBufferBuilder &_fbb) @@ -411,16 +411,16 @@ struct MonsterBuilder { inline flatbuffers::Offset CreateMonster( flatbuffers::FlatBufferBuilder &_fbb, - const Vec3 *pos = 0, + const MyGame::Sample::Vec3 *pos = 0, int16_t mana = 150, int16_t hp = 100, flatbuffers::Offset name = 0, flatbuffers::Offset> inventory = 0, - Color color = Color_Blue, - flatbuffers::Offset>> weapons = 0, - Equipment equipped_type = Equipment_NONE, + MyGame::Sample::Color color = MyGame::Sample::Color_Blue, + flatbuffers::Offset>> weapons = 0, + MyGame::Sample::Equipment equipped_type = MyGame::Sample::Equipment_NONE, flatbuffers::Offset equipped = 0, - flatbuffers::Offset> path = 0) { + flatbuffers::Offset> path = 0) { MonsterBuilder builder_(_fbb); builder_.add_path(path); builder_.add_equipped(equipped); @@ -437,20 +437,20 @@ inline flatbuffers::Offset CreateMonster( inline flatbuffers::Offset CreateMonsterDirect( flatbuffers::FlatBufferBuilder &_fbb, - const Vec3 *pos = 0, + const MyGame::Sample::Vec3 *pos = 0, int16_t mana = 150, int16_t hp = 100, const char *name = nullptr, const std::vector *inventory = nullptr, - Color color = Color_Blue, - const std::vector> *weapons = nullptr, - Equipment equipped_type = Equipment_NONE, + MyGame::Sample::Color color = MyGame::Sample::Color_Blue, + const std::vector> *weapons = nullptr, + MyGame::Sample::Equipment equipped_type = MyGame::Sample::Equipment_NONE, flatbuffers::Offset equipped = 0, - const std::vector *path = nullptr) { + const std::vector *path = nullptr) { auto name__ = name ? _fbb.CreateString(name) : 0; auto inventory__ = inventory ? _fbb.CreateVector(*inventory) : 0; - auto weapons__ = weapons ? _fbb.CreateVector>(*weapons) : 0; - auto path__ = path ? _fbb.CreateVectorOfStructs(*path) : 0; + auto weapons__ = weapons ? _fbb.CreateVector>(*weapons) : 0; + auto path__ = path ? _fbb.CreateVectorOfStructs(*path) : 0; return MyGame::Sample::CreateMonster( _fbb, pos, @@ -573,13 +573,13 @@ inline MonsterT *Monster::UnPack(const flatbuffers::resolver_function_t *_resolv inline void Monster::UnPackTo(MonsterT *_o, const flatbuffers::resolver_function_t *_resolver) const { (void)_o; (void)_resolver; - { auto _e = pos(); if (_e) _o->pos = flatbuffers::unique_ptr(new Vec3(*_e)); }; + { auto _e = pos(); if (_e) _o->pos = flatbuffers::unique_ptr(new MyGame::Sample::Vec3(*_e)); }; { auto _e = mana(); _o->mana = _e; }; { auto _e = hp(); _o->hp = _e; }; { auto _e = name(); if (_e) _o->name = _e->str(); }; { auto _e = inventory(); if (_e) { _o->inventory.resize(_e->size()); for (flatbuffers::uoffset_t _i = 0; _i < _e->size(); _i++) { _o->inventory[_i] = _e->Get(_i); } } }; { auto _e = color(); _o->color = _e; }; - { auto _e = weapons(); if (_e) { _o->weapons.resize(_e->size()); for (flatbuffers::uoffset_t _i = 0; _i < _e->size(); _i++) { _o->weapons[_i] = flatbuffers::unique_ptr(_e->Get(_i)->UnPack(_resolver)); } } }; + { auto _e = weapons(); if (_e) { _o->weapons.resize(_e->size()); for (flatbuffers::uoffset_t _i = 0; _i < _e->size(); _i++) { _o->weapons[_i] = flatbuffers::unique_ptr(_e->Get(_i)->UnPack(_resolver)); } } }; { auto _e = equipped_type(); _o->equipped.type = _e; }; { auto _e = equipped(); if (_e) _o->equipped.value = EquipmentUnion::UnPack(_e, equipped_type(), _resolver); }; { auto _e = path(); if (_e) { _o->path.resize(_e->size()); for (flatbuffers::uoffset_t _i = 0; _i < _e->size(); _i++) { _o->path[_i] = *_e->Get(_i); } } }; @@ -599,7 +599,7 @@ inline flatbuffers::Offset CreateMonster(flatbuffers::FlatBufferBuilder auto _name = _o->name.empty() ? 0 : _fbb.CreateString(_o->name); auto _inventory = _o->inventory.size() ? _fbb.CreateVector(_o->inventory) : 0; auto _color = _o->color; - auto _weapons = _o->weapons.size() ? _fbb.CreateVector> (_o->weapons.size(), [](size_t i, _VectorArgs *__va) { return CreateWeapon(*__va->__fbb, __va->__o->weapons[i].get(), __va->__rehasher); }, &_va ) : 0; + auto _weapons = _o->weapons.size() ? _fbb.CreateVector> (_o->weapons.size(), [](size_t i, _VectorArgs *__va) { return CreateWeapon(*__va->__fbb, __va->__o->weapons[i].get(), __va->__rehasher); }, &_va ) : 0; auto _equipped_type = _o->equipped.type; auto _equipped = _o->equipped.Pack(_fbb); auto _path = _o->path.size() ? _fbb.CreateVectorOfStructs(_o->path) : 0; @@ -652,7 +652,7 @@ inline bool VerifyEquipment(flatbuffers::Verifier &verifier, const void *obj, Eq return true; } case Equipment_Weapon: { - auto ptr = reinterpret_cast(obj); + auto ptr = reinterpret_cast(obj); return verifier.VerifyTable(ptr); } default: return false; @@ -674,7 +674,7 @@ inline bool VerifyEquipmentVector(flatbuffers::Verifier &verifier, const flatbuf inline void *EquipmentUnion::UnPack(const void *obj, Equipment type, const flatbuffers::resolver_function_t *resolver) { switch (type) { case Equipment_Weapon: { - auto ptr = reinterpret_cast(obj); + auto ptr = reinterpret_cast(obj); return ptr->UnPack(resolver); } default: return nullptr; @@ -684,7 +684,7 @@ inline void *EquipmentUnion::UnPack(const void *obj, Equipment type, const flatb inline flatbuffers::Offset EquipmentUnion::Pack(flatbuffers::FlatBufferBuilder &_fbb, const flatbuffers::rehasher_function_t *_rehasher) const { switch (type) { case Equipment_Weapon: { - auto ptr = reinterpret_cast(value); + auto ptr = reinterpret_cast(value); return CreateWeapon(_fbb, ptr, _rehasher).Union(); } default: return 0; @@ -694,7 +694,7 @@ inline flatbuffers::Offset EquipmentUnion::Pack(flatbuffers::FlatBufferBui inline EquipmentUnion::EquipmentUnion(const EquipmentUnion &u) FLATBUFFERS_NOEXCEPT : type(u.type), value(nullptr) { switch (type) { case Equipment_Weapon: { - value = new WeaponT(*reinterpret_cast(u.value)); + value = new MyGame::Sample::WeaponT(*reinterpret_cast(u.value)); break; } default: @@ -705,7 +705,7 @@ inline EquipmentUnion::EquipmentUnion(const EquipmentUnion &u) FLATBUFFERS_NOEXC inline void EquipmentUnion::Reset() { switch (type) { case Equipment_Weapon: { - auto ptr = reinterpret_cast(value); + auto ptr = reinterpret_cast(value); delete ptr; break; } @@ -722,7 +722,7 @@ inline const flatbuffers::TypeTable *ColorTypeTable() { { flatbuffers::ET_CHAR, 0, 0 } }; static const flatbuffers::TypeFunction type_refs[] = { - ColorTypeTable + MyGame::Sample::ColorTypeTable }; static const char * const names[] = { "Red", @@ -741,7 +741,7 @@ inline const flatbuffers::TypeTable *EquipmentTypeTable() { { flatbuffers::ET_SEQUENCE, 0, 0 } }; static const flatbuffers::TypeFunction type_refs[] = { - WeaponTypeTable + MyGame::Sample::WeaponTypeTable }; static const char * const names[] = { "NONE", @@ -786,10 +786,10 @@ inline const flatbuffers::TypeTable *MonsterTypeTable() { { flatbuffers::ET_SEQUENCE, 1, 0 } }; static const flatbuffers::TypeFunction type_refs[] = { - Vec3TypeTable, - ColorTypeTable, - WeaponTypeTable, - EquipmentTypeTable + MyGame::Sample::Vec3TypeTable, + MyGame::Sample::ColorTypeTable, + MyGame::Sample::WeaponTypeTable, + MyGame::Sample::EquipmentTypeTable }; static const char * const names[] = { "pos", @@ -859,16 +859,16 @@ inline void FinishSizePrefixedMonsterBuffer( fbb.FinishSizePrefixed(root); } -inline flatbuffers::unique_ptr UnPackMonster( +inline flatbuffers::unique_ptr UnPackMonster( const void *buf, const flatbuffers::resolver_function_t *res = nullptr) { - return flatbuffers::unique_ptr(GetMonster(buf)->UnPack(res)); + return flatbuffers::unique_ptr(GetMonster(buf)->UnPack(res)); } -inline flatbuffers::unique_ptr UnPackSizePrefixedMonster( +inline flatbuffers::unique_ptr UnPackSizePrefixedMonster( const void *buf, const flatbuffers::resolver_function_t *res = nullptr) { - return flatbuffers::unique_ptr(GetSizePrefixedMonster(buf)->UnPack(res)); + return flatbuffers::unique_ptr(GetSizePrefixedMonster(buf)->UnPack(res)); } } // namespace Sample diff --git a/src/code_generators.cpp b/src/code_generators.cpp index 3b10db7f5..9e6a26906 100644 --- a/src/code_generators.cpp +++ b/src/code_generators.cpp @@ -105,11 +105,9 @@ std::string BaseGenerator::LastNamespacePart(const Namespace &ns) { return std::string(""); } -// Ensure that a type is prefixed with its namespace whenever it is used -// outside of its namespace. +// Ensure that a type is prefixed with its namespace. std::string BaseGenerator::WrapInNameSpace(const Namespace *ns, const std::string &name) const { - if (CurrentNameSpace() == ns) return name; std::string qualified_name = qualifying_start_; for (auto it = ns->components.begin(); it != ns->components.end(); ++it) qualified_name += *it + qualifying_separator_; diff --git a/src/idl_gen_general.cpp b/src/idl_gen_general.cpp index 7249e10f9..2e56c6b4b 100644 --- a/src/idl_gen_general.cpp +++ b/src/idl_gen_general.cpp @@ -1182,7 +1182,7 @@ class GeneralGenerator : public BaseGenerator { auto nested_type_name = WrapInNameSpace(*field.nested_flatbuffer); auto nested_method_name = MakeCamel(field.name, lang_.first_camel_upper) + "As" + - nested_type_name; + field.nested_flatbuffer->name; auto get_nested_method_name = nested_method_name; if (lang_.language == IDLOptions::kCSharp) { get_nested_method_name = "Get" + nested_method_name; diff --git a/tests/MyGame/Example/Ability.cs b/tests/MyGame/Example/Ability.cs index 17dce4ef6..fbfa3c91e 100644 --- a/tests/MyGame/Example/Ability.cs +++ b/tests/MyGame/Example/Ability.cs @@ -20,11 +20,11 @@ public struct Ability : IFlatbufferObject public uint Distance { get { return __p.bb.GetUint(__p.bb_pos + 4); } } public void MutateDistance(uint distance) { __p.bb.PutUint(__p.bb_pos + 4, distance); } - public static Offset CreateAbility(FlatBufferBuilder builder, uint Id, uint Distance) { + public static Offset CreateAbility(FlatBufferBuilder builder, uint Id, uint Distance) { builder.Prep(4, 8); builder.PutUint(Distance); builder.PutUint(Id); - return new Offset(builder.Offset); + return new Offset(builder.Offset); } }; diff --git a/tests/MyGame/Example/Monster.cs b/tests/MyGame/Example/Monster.cs index 2d0e27428..7dcab2f63 100644 --- a/tests/MyGame/Example/Monster.cs +++ b/tests/MyGame/Example/Monster.cs @@ -19,7 +19,7 @@ public struct Monster : IFlatbufferObject public void __init(int _i, ByteBuffer _bb) { __p.bb_pos = _i; __p.bb = _bb; } public Monster __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } - public Vec3? Pos { get { int o = __p.__offset(4); return o != 0 ? (Vec3?)(new Vec3()).__assign(o + __p.bb_pos, __p.bb) : null; } } + public MyGame.Example.Vec3? Pos { get { int o = __p.__offset(4); return o != 0 ? (MyGame.Example.Vec3?)(new MyGame.Example.Vec3()).__assign(o + __p.bb_pos, __p.bb) : null; } } public short Mana { get { int o = __p.__offset(6); return o != 0 ? __p.bb.GetShort(o + __p.bb_pos) : (short)150; } } public bool MutateMana(short mana) { int o = __p.__offset(6); if (o != 0) { __p.bb.PutShort(o + __p.bb_pos, mana); return true; } else { return false; } } public short Hp { get { int o = __p.__offset(8); return o != 0 ? __p.bb.GetShort(o + __p.bb_pos) : (short)100; } } @@ -40,21 +40,21 @@ public struct Monster : IFlatbufferObject #endif public byte[] GetInventoryArray() { return __p.__vector_as_array(14); } public bool MutateInventory(int j, byte inventory) { int o = __p.__offset(14); if (o != 0) { __p.bb.Put(__p.__vector(o) + j * 1, inventory); return true; } else { return false; } } - public Color Color { get { int o = __p.__offset(16); return o != 0 ? (Color)__p.bb.Get(o + __p.bb_pos) : Color.Blue; } } - public bool MutateColor(Color color) { int o = __p.__offset(16); if (o != 0) { __p.bb.Put(o + __p.bb_pos, (byte)color); return true; } else { return false; } } - public Any TestType { get { int o = __p.__offset(18); return o != 0 ? (Any)__p.bb.Get(o + __p.bb_pos) : Any.NONE; } } - public bool MutateTestType(Any test_type) { int o = __p.__offset(18); if (o != 0) { __p.bb.Put(o + __p.bb_pos, (byte)test_type); return true; } else { return false; } } + public MyGame.Example.Color Color { get { int o = __p.__offset(16); return o != 0 ? (MyGame.Example.Color)__p.bb.Get(o + __p.bb_pos) : MyGame.Example.Color.Blue; } } + public bool MutateColor(MyGame.Example.Color color) { int o = __p.__offset(16); if (o != 0) { __p.bb.Put(o + __p.bb_pos, (byte)color); return true; } else { return false; } } + public MyGame.Example.Any TestType { get { int o = __p.__offset(18); return o != 0 ? (MyGame.Example.Any)__p.bb.Get(o + __p.bb_pos) : MyGame.Example.Any.NONE; } } + public bool MutateTestType(MyGame.Example.Any test_type) { int o = __p.__offset(18); if (o != 0) { __p.bb.Put(o + __p.bb_pos, (byte)test_type); return true; } else { return false; } } public TTable? Test() where TTable : struct, IFlatbufferObject { int o = __p.__offset(20); return o != 0 ? (TTable?)__p.__union(o) : null; } - public Test? Test4(int j) { int o = __p.__offset(22); return o != 0 ? (Test?)(new Test()).__assign(__p.__vector(o) + j * 4, __p.bb) : null; } + public MyGame.Example.Test? Test4(int j) { int o = __p.__offset(22); return o != 0 ? (MyGame.Example.Test?)(new MyGame.Example.Test()).__assign(__p.__vector(o) + j * 4, __p.bb) : null; } public int Test4Length { get { int o = __p.__offset(22); return o != 0 ? __p.__vector_len(o) : 0; } } public string Testarrayofstring(int j) { int o = __p.__offset(24); return o != 0 ? __p.__string(__p.__vector(o) + j * 4) : null; } public int TestarrayofstringLength { get { int o = __p.__offset(24); return o != 0 ? __p.__vector_len(o) : 0; } } /// an example documentation comment: this will end up in the generated code /// multiline too - public Monster? Testarrayoftables(int j) { int o = __p.__offset(26); return o != 0 ? (Monster?)(new Monster()).__assign(__p.__indirect(__p.__vector(o) + j * 4), __p.bb) : null; } + public MyGame.Example.Monster? Testarrayoftables(int j) { int o = __p.__offset(26); return o != 0 ? (MyGame.Example.Monster?)(new MyGame.Example.Monster()).__assign(__p.__indirect(__p.__vector(o) + j * 4), __p.bb) : null; } public int TestarrayoftablesLength { get { int o = __p.__offset(26); return o != 0 ? __p.__vector_len(o) : 0; } } - public Monster? TestarrayoftablesByKey(string key) { int o = __p.__offset(26); return o != 0 ? Monster.__lookup_by_key(__p.__vector(o), key, __p.bb) : null; } - public Monster? Enemy { get { int o = __p.__offset(28); return o != 0 ? (Monster?)(new Monster()).__assign(__p.__indirect(o + __p.bb_pos), __p.bb) : null; } } + public MyGame.Example.Monster? TestarrayoftablesByKey(string key) { int o = __p.__offset(26); return o != 0 ? MyGame.Example.Monster.__lookup_by_key(__p.__vector(o), key, __p.bb) : null; } + public MyGame.Example.Monster? Enemy { get { int o = __p.__offset(28); return o != 0 ? (MyGame.Example.Monster?)(new MyGame.Example.Monster()).__assign(__p.__indirect(o + __p.bb_pos), __p.bb) : null; } } public byte Testnestedflatbuffer(int j) { int o = __p.__offset(30); return o != 0 ? __p.bb.Get(__p.__vector(o) + j * 1) : (byte)0; } public int TestnestedflatbufferLength { get { int o = __p.__offset(30); return o != 0 ? __p.__vector_len(o) : 0; } } #if ENABLE_SPAN_T @@ -63,9 +63,9 @@ public struct Monster : IFlatbufferObject public ArraySegment? GetTestnestedflatbufferBytes() { return __p.__vector_as_arraysegment(30); } #endif public byte[] GetTestnestedflatbufferArray() { return __p.__vector_as_array(30); } - public Monster? GetTestnestedflatbufferAsMonster() { int o = __p.__offset(30); return o != 0 ? (Monster?)(new Monster()).__assign(__p.__indirect(__p.__vector(o)), __p.bb) : null; } + public MyGame.Example.Monster? GetTestnestedflatbufferAsMonster() { int o = __p.__offset(30); return o != 0 ? (MyGame.Example.Monster?)(new MyGame.Example.Monster()).__assign(__p.__indirect(__p.__vector(o)), __p.bb) : null; } public bool MutateTestnestedflatbuffer(int j, byte testnestedflatbuffer) { int o = __p.__offset(30); if (o != 0) { __p.bb.Put(__p.__vector(o) + j * 1, testnestedflatbuffer); return true; } else { return false; } } - public Stat? Testempty { get { int o = __p.__offset(32); return o != 0 ? (Stat?)(new Stat()).__assign(__p.__indirect(o + __p.bb_pos), __p.bb) : null; } } + public MyGame.Example.Stat? Testempty { get { int o = __p.__offset(32); return o != 0 ? (MyGame.Example.Stat?)(new MyGame.Example.Stat()).__assign(__p.__indirect(o + __p.bb_pos), __p.bb) : null; } } public bool Testbool { get { int o = __p.__offset(34); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } public bool MutateTestbool(bool testbool) { int o = __p.__offset(34); if (o != 0) { __p.bb.Put(o + __p.bb_pos, (byte)(testbool ? 1 : 0)); return true; } else { return false; } } public int Testhashs32Fnv1 { get { int o = __p.__offset(36); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } @@ -101,7 +101,7 @@ public struct Monster : IFlatbufferObject public bool MutateTestf3(float testf3) { int o = __p.__offset(58); if (o != 0) { __p.bb.PutFloat(o + __p.bb_pos, testf3); return true; } else { return false; } } public string Testarrayofstring2(int j) { int o = __p.__offset(60); return o != 0 ? __p.__string(__p.__vector(o) + j * 4) : null; } public int Testarrayofstring2Length { get { int o = __p.__offset(60); return o != 0 ? __p.__vector_len(o) : 0; } } - public Ability? Testarrayofsortedstruct(int j) { int o = __p.__offset(62); return o != 0 ? (Ability?)(new Ability()).__assign(__p.__vector(o) + j * 8, __p.bb) : null; } + public MyGame.Example.Ability? Testarrayofsortedstruct(int j) { int o = __p.__offset(62); return o != 0 ? (MyGame.Example.Ability?)(new MyGame.Example.Ability()).__assign(__p.__vector(o) + j * 8, __p.bb) : null; } public int TestarrayofsortedstructLength { get { int o = __p.__offset(62); return o != 0 ? __p.__vector_len(o) : 0; } } public byte Flex(int j) { int o = __p.__offset(64); return o != 0 ? __p.bb.Get(__p.__vector(o) + j * 1) : (byte)0; } public int FlexLength { get { int o = __p.__offset(64); return o != 0 ? __p.__vector_len(o) : 0; } } @@ -112,7 +112,7 @@ public struct Monster : IFlatbufferObject #endif public byte[] GetFlexArray() { return __p.__vector_as_array(64); } public bool MutateFlex(int j, byte flex) { int o = __p.__offset(64); if (o != 0) { __p.bb.Put(__p.__vector(o) + j * 1, flex); return true; } else { return false; } } - public Test? Test5(int j) { int o = __p.__offset(66); return o != 0 ? (Test?)(new Test()).__assign(__p.__vector(o) + j * 4, __p.bb) : null; } + public MyGame.Example.Test? Test5(int j) { int o = __p.__offset(66); return o != 0 ? (MyGame.Example.Test?)(new MyGame.Example.Test()).__assign(__p.__vector(o) + j * 4, __p.bb) : null; } public int Test5Length { get { int o = __p.__offset(66); return o != 0 ? __p.__vector_len(o) : 0; } } public long VectorOfLongs(int j) { int o = __p.__offset(68); return o != 0 ? __p.bb.GetLong(__p.__vector(o) + j * 8) : (long)0; } public int VectorOfLongsLength { get { int o = __p.__offset(68); return o != 0 ? __p.__vector_len(o) : 0; } } @@ -133,9 +133,9 @@ public struct Monster : IFlatbufferObject public double[] GetVectorOfDoublesArray() { return __p.__vector_as_array(70); } public bool MutateVectorOfDoubles(int j, double vector_of_doubles) { int o = __p.__offset(70); if (o != 0) { __p.bb.PutDouble(__p.__vector(o) + j * 8, vector_of_doubles); return true; } else { return false; } } public MyGame.InParentNamespace? ParentNamespaceTest { get { int o = __p.__offset(72); return o != 0 ? (MyGame.InParentNamespace?)(new MyGame.InParentNamespace()).__assign(__p.__indirect(o + __p.bb_pos), __p.bb) : null; } } - public Referrable? VectorOfReferrables(int j) { int o = __p.__offset(74); return o != 0 ? (Referrable?)(new Referrable()).__assign(__p.__indirect(__p.__vector(o) + j * 4), __p.bb) : null; } + public MyGame.Example.Referrable? VectorOfReferrables(int j) { int o = __p.__offset(74); return o != 0 ? (MyGame.Example.Referrable?)(new MyGame.Example.Referrable()).__assign(__p.__indirect(__p.__vector(o) + j * 4), __p.bb) : null; } public int VectorOfReferrablesLength { get { int o = __p.__offset(74); return o != 0 ? __p.__vector_len(o) : 0; } } - public Referrable? VectorOfReferrablesByKey(ulong key) { int o = __p.__offset(74); return o != 0 ? Referrable.__lookup_by_key(__p.__vector(o), key, __p.bb) : null; } + public MyGame.Example.Referrable? VectorOfReferrablesByKey(ulong key) { int o = __p.__offset(74); return o != 0 ? MyGame.Example.Referrable.__lookup_by_key(__p.__vector(o), key, __p.bb) : null; } public ulong SingleWeakReference { get { int o = __p.__offset(76); return o != 0 ? __p.bb.GetUlong(o + __p.bb_pos) : (ulong)0; } } public bool MutateSingleWeakReference(ulong single_weak_reference) { int o = __p.__offset(76); if (o != 0) { __p.bb.PutUlong(o + __p.bb_pos, single_weak_reference); return true; } else { return false; } } public ulong VectorOfWeakReferences(int j) { int o = __p.__offset(78); return o != 0 ? __p.bb.GetUlong(__p.__vector(o) + j * 8) : (ulong)0; } @@ -147,9 +147,9 @@ public struct Monster : IFlatbufferObject #endif public ulong[] GetVectorOfWeakReferencesArray() { return __p.__vector_as_array(78); } public bool MutateVectorOfWeakReferences(int j, ulong vector_of_weak_references) { int o = __p.__offset(78); if (o != 0) { __p.bb.PutUlong(__p.__vector(o) + j * 8, vector_of_weak_references); return true; } else { return false; } } - public Referrable? VectorOfStrongReferrables(int j) { int o = __p.__offset(80); return o != 0 ? (Referrable?)(new Referrable()).__assign(__p.__indirect(__p.__vector(o) + j * 4), __p.bb) : null; } + public MyGame.Example.Referrable? VectorOfStrongReferrables(int j) { int o = __p.__offset(80); return o != 0 ? (MyGame.Example.Referrable?)(new MyGame.Example.Referrable()).__assign(__p.__indirect(__p.__vector(o) + j * 4), __p.bb) : null; } public int VectorOfStrongReferrablesLength { get { int o = __p.__offset(80); return o != 0 ? __p.__vector_len(o) : 0; } } - public Referrable? VectorOfStrongReferrablesByKey(ulong key) { int o = __p.__offset(80); return o != 0 ? Referrable.__lookup_by_key(__p.__vector(o), key, __p.bb) : null; } + public MyGame.Example.Referrable? VectorOfStrongReferrablesByKey(ulong key) { int o = __p.__offset(80); return o != 0 ? MyGame.Example.Referrable.__lookup_by_key(__p.__vector(o), key, __p.bb) : null; } public ulong CoOwningReference { get { int o = __p.__offset(82); return o != 0 ? __p.bb.GetUlong(o + __p.bb_pos) : (ulong)0; } } public bool MutateCoOwningReference(ulong co_owning_reference) { int o = __p.__offset(82); if (o != 0) { __p.bb.PutUlong(o + __p.bb_pos, co_owning_reference); return true; } else { return false; } } public ulong VectorOfCoOwningReferences(int j) { int o = __p.__offset(84); return o != 0 ? __p.bb.GetUlong(__p.__vector(o) + j * 8) : (ulong)0; } @@ -172,24 +172,24 @@ public struct Monster : IFlatbufferObject #endif public ulong[] GetVectorOfNonOwningReferencesArray() { return __p.__vector_as_array(88); } public bool MutateVectorOfNonOwningReferences(int j, ulong vector_of_non_owning_references) { int o = __p.__offset(88); if (o != 0) { __p.bb.PutUlong(__p.__vector(o) + j * 8, vector_of_non_owning_references); return true; } else { return false; } } - public AnyUniqueAliases AnyUniqueType { get { int o = __p.__offset(90); return o != 0 ? (AnyUniqueAliases)__p.bb.Get(o + __p.bb_pos) : AnyUniqueAliases.NONE; } } - public bool MutateAnyUniqueType(AnyUniqueAliases any_unique_type) { int o = __p.__offset(90); if (o != 0) { __p.bb.Put(o + __p.bb_pos, (byte)any_unique_type); return true; } else { return false; } } + public MyGame.Example.AnyUniqueAliases AnyUniqueType { get { int o = __p.__offset(90); return o != 0 ? (MyGame.Example.AnyUniqueAliases)__p.bb.Get(o + __p.bb_pos) : MyGame.Example.AnyUniqueAliases.NONE; } } + public bool MutateAnyUniqueType(MyGame.Example.AnyUniqueAliases any_unique_type) { int o = __p.__offset(90); if (o != 0) { __p.bb.Put(o + __p.bb_pos, (byte)any_unique_type); return true; } else { return false; } } public TTable? AnyUnique() where TTable : struct, IFlatbufferObject { int o = __p.__offset(92); return o != 0 ? (TTable?)__p.__union(o) : null; } - public AnyAmbiguousAliases AnyAmbiguousType { get { int o = __p.__offset(94); return o != 0 ? (AnyAmbiguousAliases)__p.bb.Get(o + __p.bb_pos) : AnyAmbiguousAliases.NONE; } } - public bool MutateAnyAmbiguousType(AnyAmbiguousAliases any_ambiguous_type) { int o = __p.__offset(94); if (o != 0) { __p.bb.Put(o + __p.bb_pos, (byte)any_ambiguous_type); return true; } else { return false; } } + public MyGame.Example.AnyAmbiguousAliases AnyAmbiguousType { get { int o = __p.__offset(94); return o != 0 ? (MyGame.Example.AnyAmbiguousAliases)__p.bb.Get(o + __p.bb_pos) : MyGame.Example.AnyAmbiguousAliases.NONE; } } + public bool MutateAnyAmbiguousType(MyGame.Example.AnyAmbiguousAliases any_ambiguous_type) { int o = __p.__offset(94); if (o != 0) { __p.bb.Put(o + __p.bb_pos, (byte)any_ambiguous_type); return true; } else { return false; } } public TTable? AnyAmbiguous() where TTable : struct, IFlatbufferObject { int o = __p.__offset(96); return o != 0 ? (TTable?)__p.__union(o) : null; } - public Color VectorOfEnums(int j) { int o = __p.__offset(98); return o != 0 ? (Color)__p.bb.Get(__p.__vector(o) + j * 1) : (Color)0; } + public MyGame.Example.Color VectorOfEnums(int j) { int o = __p.__offset(98); return o != 0 ? (MyGame.Example.Color)__p.bb.Get(__p.__vector(o) + j * 1) : (MyGame.Example.Color)0; } public int VectorOfEnumsLength { get { int o = __p.__offset(98); return o != 0 ? __p.__vector_len(o) : 0; } } #if ENABLE_SPAN_T public Span GetVectorOfEnumsBytes() { return __p.__vector_as_span(98); } #else public ArraySegment? GetVectorOfEnumsBytes() { return __p.__vector_as_arraysegment(98); } #endif - public Color[] GetVectorOfEnumsArray() { return __p.__vector_as_array(98); } - public bool MutateVectorOfEnums(int j, Color vector_of_enums) { int o = __p.__offset(98); if (o != 0) { __p.bb.Put(__p.__vector(o) + j * 1, (byte)vector_of_enums); return true; } else { return false; } } + public MyGame.Example.Color[] GetVectorOfEnumsArray() { return __p.__vector_as_array(98); } + public bool MutateVectorOfEnums(int j, MyGame.Example.Color vector_of_enums) { int o = __p.__offset(98); if (o != 0) { __p.bb.Put(__p.__vector(o) + j * 1, (byte)vector_of_enums); return true; } else { return false; } } public static void StartMonster(FlatBufferBuilder builder) { builder.StartTable(48); } - public static void AddPos(FlatBufferBuilder builder, Offset posOffset) { builder.AddStruct(0, posOffset.Value, 0); } + public static void AddPos(FlatBufferBuilder builder, Offset posOffset) { builder.AddStruct(0, posOffset.Value, 0); } public static void AddMana(FlatBufferBuilder builder, short mana) { builder.AddShort(1, mana, 150); } public static void AddHp(FlatBufferBuilder builder, short hp) { builder.AddShort(2, hp, 100); } public static void AddName(FlatBufferBuilder builder, StringOffset nameOffset) { builder.AddOffset(3, nameOffset.Value, 0); } @@ -197,8 +197,8 @@ public struct Monster : IFlatbufferObject public static VectorOffset CreateInventoryVector(FlatBufferBuilder builder, byte[] data) { builder.StartVector(1, data.Length, 1); for (int i = data.Length - 1; i >= 0; i--) builder.AddByte(data[i]); return builder.EndVector(); } public static VectorOffset CreateInventoryVectorBlock(FlatBufferBuilder builder, byte[] data) { builder.StartVector(1, data.Length, 1); builder.Add(data); return builder.EndVector(); } public static void StartInventoryVector(FlatBufferBuilder builder, int numElems) { builder.StartVector(1, numElems, 1); } - public static void AddColor(FlatBufferBuilder builder, Color color) { builder.AddByte(6, (byte)color, 8); } - public static void AddTestType(FlatBufferBuilder builder, Any testType) { builder.AddByte(7, (byte)testType, 0); } + public static void AddColor(FlatBufferBuilder builder, MyGame.Example.Color color) { builder.AddByte(6, (byte)color, 8); } + public static void AddTestType(FlatBufferBuilder builder, MyGame.Example.Any testType) { builder.AddByte(7, (byte)testType, 0); } public static void AddTest(FlatBufferBuilder builder, int testOffset) { builder.AddOffset(8, testOffset, 0); } public static void AddTest4(FlatBufferBuilder builder, VectorOffset test4Offset) { builder.AddOffset(9, test4Offset.Value, 0); } public static void StartTest4Vector(FlatBufferBuilder builder, int numElems) { builder.StartVector(4, numElems, 2); } @@ -207,15 +207,15 @@ public struct Monster : IFlatbufferObject public static VectorOffset CreateTestarrayofstringVectorBlock(FlatBufferBuilder builder, StringOffset[] data) { builder.StartVector(4, data.Length, 4); builder.Add(data); return builder.EndVector(); } public static void StartTestarrayofstringVector(FlatBufferBuilder builder, int numElems) { builder.StartVector(4, numElems, 4); } public static void AddTestarrayoftables(FlatBufferBuilder builder, VectorOffset testarrayoftablesOffset) { builder.AddOffset(11, testarrayoftablesOffset.Value, 0); } - public static VectorOffset CreateTestarrayoftablesVector(FlatBufferBuilder builder, Offset[] data) { builder.StartVector(4, data.Length, 4); for (int i = data.Length - 1; i >= 0; i--) builder.AddOffset(data[i].Value); return builder.EndVector(); } - public static VectorOffset CreateTestarrayoftablesVectorBlock(FlatBufferBuilder builder, Offset[] data) { builder.StartVector(4, data.Length, 4); builder.Add(data); return builder.EndVector(); } + public static VectorOffset CreateTestarrayoftablesVector(FlatBufferBuilder builder, Offset[] data) { builder.StartVector(4, data.Length, 4); for (int i = data.Length - 1; i >= 0; i--) builder.AddOffset(data[i].Value); return builder.EndVector(); } + public static VectorOffset CreateTestarrayoftablesVectorBlock(FlatBufferBuilder builder, Offset[] data) { builder.StartVector(4, data.Length, 4); builder.Add(data); return builder.EndVector(); } public static void StartTestarrayoftablesVector(FlatBufferBuilder builder, int numElems) { builder.StartVector(4, numElems, 4); } - public static void AddEnemy(FlatBufferBuilder builder, Offset enemyOffset) { builder.AddOffset(12, enemyOffset.Value, 0); } + public static void AddEnemy(FlatBufferBuilder builder, Offset enemyOffset) { builder.AddOffset(12, enemyOffset.Value, 0); } public static void AddTestnestedflatbuffer(FlatBufferBuilder builder, VectorOffset testnestedflatbufferOffset) { builder.AddOffset(13, testnestedflatbufferOffset.Value, 0); } public static VectorOffset CreateTestnestedflatbufferVector(FlatBufferBuilder builder, byte[] data) { builder.StartVector(1, data.Length, 1); for (int i = data.Length - 1; i >= 0; i--) builder.AddByte(data[i]); return builder.EndVector(); } public static VectorOffset CreateTestnestedflatbufferVectorBlock(FlatBufferBuilder builder, byte[] data) { builder.StartVector(1, data.Length, 1); builder.Add(data); return builder.EndVector(); } public static void StartTestnestedflatbufferVector(FlatBufferBuilder builder, int numElems) { builder.StartVector(1, numElems, 1); } - public static void AddTestempty(FlatBufferBuilder builder, Offset testemptyOffset) { builder.AddOffset(14, testemptyOffset.Value, 0); } + public static void AddTestempty(FlatBufferBuilder builder, Offset testemptyOffset) { builder.AddOffset(14, testemptyOffset.Value, 0); } public static void AddTestbool(FlatBufferBuilder builder, bool testbool) { builder.AddBool(15, testbool, false); } public static void AddTesthashs32Fnv1(FlatBufferBuilder builder, int testhashs32Fnv1) { builder.AddInt(16, testhashs32Fnv1, 0); } public static void AddTesthashu32Fnv1(FlatBufferBuilder builder, uint testhashu32Fnv1) { builder.AddUint(17, testhashu32Fnv1, 0); } @@ -254,8 +254,8 @@ public struct Monster : IFlatbufferObject public static void StartVectorOfDoublesVector(FlatBufferBuilder builder, int numElems) { builder.StartVector(8, numElems, 8); } public static void AddParentNamespaceTest(FlatBufferBuilder builder, Offset parentNamespaceTestOffset) { builder.AddOffset(34, parentNamespaceTestOffset.Value, 0); } public static void AddVectorOfReferrables(FlatBufferBuilder builder, VectorOffset vectorOfReferrablesOffset) { builder.AddOffset(35, vectorOfReferrablesOffset.Value, 0); } - public static VectorOffset CreateVectorOfReferrablesVector(FlatBufferBuilder builder, Offset[] data) { builder.StartVector(4, data.Length, 4); for (int i = data.Length - 1; i >= 0; i--) builder.AddOffset(data[i].Value); return builder.EndVector(); } - public static VectorOffset CreateVectorOfReferrablesVectorBlock(FlatBufferBuilder builder, Offset[] data) { builder.StartVector(4, data.Length, 4); builder.Add(data); return builder.EndVector(); } + public static VectorOffset CreateVectorOfReferrablesVector(FlatBufferBuilder builder, Offset[] data) { builder.StartVector(4, data.Length, 4); for (int i = data.Length - 1; i >= 0; i--) builder.AddOffset(data[i].Value); return builder.EndVector(); } + public static VectorOffset CreateVectorOfReferrablesVectorBlock(FlatBufferBuilder builder, Offset[] data) { builder.StartVector(4, data.Length, 4); builder.Add(data); return builder.EndVector(); } public static void StartVectorOfReferrablesVector(FlatBufferBuilder builder, int numElems) { builder.StartVector(4, numElems, 4); } public static void AddSingleWeakReference(FlatBufferBuilder builder, ulong singleWeakReference) { builder.AddUlong(36, singleWeakReference, 0); } public static void AddVectorOfWeakReferences(FlatBufferBuilder builder, VectorOffset vectorOfWeakReferencesOffset) { builder.AddOffset(37, vectorOfWeakReferencesOffset.Value, 0); } @@ -263,8 +263,8 @@ public struct Monster : IFlatbufferObject public static VectorOffset CreateVectorOfWeakReferencesVectorBlock(FlatBufferBuilder builder, ulong[] data) { builder.StartVector(8, data.Length, 8); builder.Add(data); return builder.EndVector(); } public static void StartVectorOfWeakReferencesVector(FlatBufferBuilder builder, int numElems) { builder.StartVector(8, numElems, 8); } public static void AddVectorOfStrongReferrables(FlatBufferBuilder builder, VectorOffset vectorOfStrongReferrablesOffset) { builder.AddOffset(38, vectorOfStrongReferrablesOffset.Value, 0); } - public static VectorOffset CreateVectorOfStrongReferrablesVector(FlatBufferBuilder builder, Offset[] data) { builder.StartVector(4, data.Length, 4); for (int i = data.Length - 1; i >= 0; i--) builder.AddOffset(data[i].Value); return builder.EndVector(); } - public static VectorOffset CreateVectorOfStrongReferrablesVectorBlock(FlatBufferBuilder builder, Offset[] data) { builder.StartVector(4, data.Length, 4); builder.Add(data); return builder.EndVector(); } + public static VectorOffset CreateVectorOfStrongReferrablesVector(FlatBufferBuilder builder, Offset[] data) { builder.StartVector(4, data.Length, 4); for (int i = data.Length - 1; i >= 0; i--) builder.AddOffset(data[i].Value); return builder.EndVector(); } + public static VectorOffset CreateVectorOfStrongReferrablesVectorBlock(FlatBufferBuilder builder, Offset[] data) { builder.StartVector(4, data.Length, 4); builder.Add(data); return builder.EndVector(); } public static void StartVectorOfStrongReferrablesVector(FlatBufferBuilder builder, int numElems) { builder.StartVector(4, numElems, 4); } public static void AddCoOwningReference(FlatBufferBuilder builder, ulong coOwningReference) { builder.AddUlong(39, coOwningReference, 0); } public static void AddVectorOfCoOwningReferences(FlatBufferBuilder builder, VectorOffset vectorOfCoOwningReferencesOffset) { builder.AddOffset(40, vectorOfCoOwningReferencesOffset.Value, 0); } @@ -276,21 +276,21 @@ public struct Monster : IFlatbufferObject public static VectorOffset CreateVectorOfNonOwningReferencesVector(FlatBufferBuilder builder, ulong[] data) { builder.StartVector(8, data.Length, 8); for (int i = data.Length - 1; i >= 0; i--) builder.AddUlong(data[i]); return builder.EndVector(); } public static VectorOffset CreateVectorOfNonOwningReferencesVectorBlock(FlatBufferBuilder builder, ulong[] data) { builder.StartVector(8, data.Length, 8); builder.Add(data); return builder.EndVector(); } public static void StartVectorOfNonOwningReferencesVector(FlatBufferBuilder builder, int numElems) { builder.StartVector(8, numElems, 8); } - public static void AddAnyUniqueType(FlatBufferBuilder builder, AnyUniqueAliases anyUniqueType) { builder.AddByte(43, (byte)anyUniqueType, 0); } + public static void AddAnyUniqueType(FlatBufferBuilder builder, MyGame.Example.AnyUniqueAliases anyUniqueType) { builder.AddByte(43, (byte)anyUniqueType, 0); } public static void AddAnyUnique(FlatBufferBuilder builder, int anyUniqueOffset) { builder.AddOffset(44, anyUniqueOffset, 0); } - public static void AddAnyAmbiguousType(FlatBufferBuilder builder, AnyAmbiguousAliases anyAmbiguousType) { builder.AddByte(45, (byte)anyAmbiguousType, 0); } + public static void AddAnyAmbiguousType(FlatBufferBuilder builder, MyGame.Example.AnyAmbiguousAliases anyAmbiguousType) { builder.AddByte(45, (byte)anyAmbiguousType, 0); } public static void AddAnyAmbiguous(FlatBufferBuilder builder, int anyAmbiguousOffset) { builder.AddOffset(46, anyAmbiguousOffset, 0); } public static void AddVectorOfEnums(FlatBufferBuilder builder, VectorOffset vectorOfEnumsOffset) { builder.AddOffset(47, vectorOfEnumsOffset.Value, 0); } - public static VectorOffset CreateVectorOfEnumsVector(FlatBufferBuilder builder, Color[] data) { builder.StartVector(1, data.Length, 1); for (int i = data.Length - 1; i >= 0; i--) builder.AddByte((byte)data[i]); return builder.EndVector(); } - public static VectorOffset CreateVectorOfEnumsVectorBlock(FlatBufferBuilder builder, Color[] data) { builder.StartVector(1, data.Length, 1); builder.Add(data); return builder.EndVector(); } + public static VectorOffset CreateVectorOfEnumsVector(FlatBufferBuilder builder, MyGame.Example.Color[] data) { builder.StartVector(1, data.Length, 1); for (int i = data.Length - 1; i >= 0; i--) builder.AddByte((byte)data[i]); return builder.EndVector(); } + public static VectorOffset CreateVectorOfEnumsVectorBlock(FlatBufferBuilder builder, MyGame.Example.Color[] data) { builder.StartVector(1, data.Length, 1); builder.Add(data); return builder.EndVector(); } public static void StartVectorOfEnumsVector(FlatBufferBuilder builder, int numElems) { builder.StartVector(1, numElems, 1); } - public static Offset EndMonster(FlatBufferBuilder builder) { + public static Offset EndMonster(FlatBufferBuilder builder) { int o = builder.EndTable(); builder.Required(o, 10); // name - return new Offset(o); + return new Offset(o); } - public static void FinishMonsterBuffer(FlatBufferBuilder builder, Offset offset) { builder.Finish(offset.Value, "MONS"); } - public static void FinishSizePrefixedMonsterBuffer(FlatBufferBuilder builder, Offset offset) { builder.FinishSizePrefixed(offset.Value, "MONS"); } + public static void FinishMonsterBuffer(FlatBufferBuilder builder, Offset offset) { builder.Finish(offset.Value, "MONS"); } + public static void FinishSizePrefixedMonsterBuffer(FlatBufferBuilder builder, Offset offset) { builder.FinishSizePrefixed(offset.Value, "MONS"); } public static VectorOffset CreateSortedVectorOfMonster(FlatBufferBuilder builder, Offset[] offsets) { Array.Sort(offsets, (Offset o1, Offset o2) => Table.CompareStrings(Table.__offset(10, o1.Value, builder.DataBuffer), Table.__offset(10, o2.Value, builder.DataBuffer), builder.DataBuffer)); diff --git a/tests/MyGame/Example/Monster.java b/tests/MyGame/Example/Monster.java index e1208d735..223a729fc 100644 --- a/tests/MyGame/Example/Monster.java +++ b/tests/MyGame/Example/Monster.java @@ -18,8 +18,8 @@ public final class Monster extends Table { public void __init(int _i, ByteBuffer _bb) { bb_pos = _i; bb = _bb; vtable_start = bb_pos - bb.getInt(bb_pos); vtable_size = bb.getShort(vtable_start); } public Monster __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } - public Vec3 pos() { return pos(new Vec3()); } - public Vec3 pos(Vec3 obj) { int o = __offset(4); return o != 0 ? obj.__assign(o + bb_pos, bb) : null; } + public MyGame.Example.Vec3 pos() { return pos(new MyGame.Example.Vec3()); } + public MyGame.Example.Vec3 pos(MyGame.Example.Vec3 obj) { int o = __offset(4); return o != 0 ? obj.__assign(o + bb_pos, bb) : null; } public short mana() { int o = __offset(6); return o != 0 ? bb.getShort(o + bb_pos) : 150; } public boolean mutateMana(short mana) { int o = __offset(6); if (o != 0) { bb.putShort(o + bb_pos, mana); return true; } else { return false; } } public short hp() { int o = __offset(8); return o != 0 ? bb.getShort(o + bb_pos) : 100; } @@ -37,8 +37,8 @@ public final class Monster extends Table { public byte testType() { int o = __offset(18); return o != 0 ? bb.get(o + bb_pos) : 0; } public boolean mutateTestType(byte test_type) { int o = __offset(18); if (o != 0) { bb.put(o + bb_pos, test_type); return true; } else { return false; } } public Table test(Table obj) { int o = __offset(20); return o != 0 ? __union(obj, o) : null; } - public Test test4(int j) { return test4(new Test(), j); } - public Test test4(Test obj, int j) { int o = __offset(22); return o != 0 ? obj.__assign(__vector(o) + j * 4, bb) : null; } + public MyGame.Example.Test test4(int j) { return test4(new MyGame.Example.Test(), j); } + public MyGame.Example.Test test4(MyGame.Example.Test obj, int j) { int o = __offset(22); return o != 0 ? obj.__assign(__vector(o) + j * 4, bb) : null; } public int test4Length() { int o = __offset(22); return o != 0 ? __vector_len(o) : 0; } public String testarrayofstring(int j) { int o = __offset(24); return o != 0 ? __string(__vector(o) + j * 4) : null; } public int testarrayofstringLength() { int o = __offset(24); return o != 0 ? __vector_len(o) : 0; } @@ -46,22 +46,22 @@ public final class Monster extends Table { * an example documentation comment: this will end up in the generated code * multiline too */ - public Monster testarrayoftables(int j) { return testarrayoftables(new Monster(), j); } - public Monster testarrayoftables(Monster obj, int j) { int o = __offset(26); return o != 0 ? obj.__assign(__indirect(__vector(o) + j * 4), bb) : null; } + public MyGame.Example.Monster testarrayoftables(int j) { return testarrayoftables(new MyGame.Example.Monster(), j); } + public MyGame.Example.Monster testarrayoftables(MyGame.Example.Monster obj, int j) { int o = __offset(26); return o != 0 ? obj.__assign(__indirect(__vector(o) + j * 4), bb) : null; } public int testarrayoftablesLength() { int o = __offset(26); return o != 0 ? __vector_len(o) : 0; } - public Monster testarrayoftablesByKey(String key) { int o = __offset(26); return o != 0 ? Monster.__lookup_by_key(null, __vector(o), key, bb) : null; } - public Monster testarrayoftablesByKey(Monster obj, String key) { int o = __offset(26); return o != 0 ? Monster.__lookup_by_key(obj, __vector(o), key, bb) : null; } - public Monster enemy() { return enemy(new Monster()); } - public Monster enemy(Monster obj) { int o = __offset(28); return o != 0 ? obj.__assign(__indirect(o + bb_pos), bb) : null; } + public MyGame.Example.Monster testarrayoftablesByKey(String key) { int o = __offset(26); return o != 0 ? MyGame.Example.Monster.__lookup_by_key(null, __vector(o), key, bb) : null; } + public MyGame.Example.Monster testarrayoftablesByKey(MyGame.Example.Monster obj, String key) { int o = __offset(26); return o != 0 ? MyGame.Example.Monster.__lookup_by_key(obj, __vector(o), key, bb) : null; } + public MyGame.Example.Monster enemy() { return enemy(new MyGame.Example.Monster()); } + public MyGame.Example.Monster enemy(MyGame.Example.Monster obj) { int o = __offset(28); return o != 0 ? obj.__assign(__indirect(o + bb_pos), bb) : null; } public int testnestedflatbuffer(int j) { int o = __offset(30); return o != 0 ? bb.get(__vector(o) + j * 1) & 0xFF : 0; } public int testnestedflatbufferLength() { int o = __offset(30); return o != 0 ? __vector_len(o) : 0; } public ByteBuffer testnestedflatbufferAsByteBuffer() { return __vector_as_bytebuffer(30, 1); } public ByteBuffer testnestedflatbufferInByteBuffer(ByteBuffer _bb) { return __vector_in_bytebuffer(_bb, 30, 1); } - public Monster testnestedflatbufferAsMonster() { return testnestedflatbufferAsMonster(new Monster()); } - public Monster testnestedflatbufferAsMonster(Monster obj) { int o = __offset(30); return o != 0 ? obj.__assign(__indirect(__vector(o)), bb) : null; } + public MyGame.Example.Monster testnestedflatbufferAsMonster() { return testnestedflatbufferAsMonster(new MyGame.Example.Monster()); } + public MyGame.Example.Monster testnestedflatbufferAsMonster(MyGame.Example.Monster obj) { int o = __offset(30); return o != 0 ? obj.__assign(__indirect(__vector(o)), bb) : null; } public boolean mutateTestnestedflatbuffer(int j, int testnestedflatbuffer) { int o = __offset(30); if (o != 0) { bb.put(__vector(o) + j * 1, (byte)testnestedflatbuffer); return true; } else { return false; } } - public Stat testempty() { return testempty(new Stat()); } - public Stat testempty(Stat obj) { int o = __offset(32); return o != 0 ? obj.__assign(__indirect(o + bb_pos), bb) : null; } + public MyGame.Example.Stat testempty() { return testempty(new MyGame.Example.Stat()); } + public MyGame.Example.Stat testempty(MyGame.Example.Stat obj) { int o = __offset(32); return o != 0 ? obj.__assign(__indirect(o + bb_pos), bb) : null; } public boolean testbool() { int o = __offset(34); return o != 0 ? 0!=bb.get(o + bb_pos) : false; } public boolean mutateTestbool(boolean testbool) { int o = __offset(34); if (o != 0) { bb.put(o + bb_pos, (byte)(testbool ? 1 : 0)); return true; } else { return false; } } public int testhashs32Fnv1() { int o = __offset(36); return o != 0 ? bb.getInt(o + bb_pos) : 0; } @@ -93,16 +93,16 @@ public final class Monster extends Table { public boolean mutateTestf3(float testf3) { int o = __offset(58); if (o != 0) { bb.putFloat(o + bb_pos, testf3); return true; } else { return false; } } public String testarrayofstring2(int j) { int o = __offset(60); return o != 0 ? __string(__vector(o) + j * 4) : null; } public int testarrayofstring2Length() { int o = __offset(60); return o != 0 ? __vector_len(o) : 0; } - public Ability testarrayofsortedstruct(int j) { return testarrayofsortedstruct(new Ability(), j); } - public Ability testarrayofsortedstruct(Ability obj, int j) { int o = __offset(62); return o != 0 ? obj.__assign(__vector(o) + j * 8, bb) : null; } + public MyGame.Example.Ability testarrayofsortedstruct(int j) { return testarrayofsortedstruct(new MyGame.Example.Ability(), j); } + public MyGame.Example.Ability testarrayofsortedstruct(MyGame.Example.Ability obj, int j) { int o = __offset(62); return o != 0 ? obj.__assign(__vector(o) + j * 8, bb) : null; } public int testarrayofsortedstructLength() { int o = __offset(62); return o != 0 ? __vector_len(o) : 0; } public int flex(int j) { int o = __offset(64); return o != 0 ? bb.get(__vector(o) + j * 1) & 0xFF : 0; } public int flexLength() { int o = __offset(64); return o != 0 ? __vector_len(o) : 0; } public ByteBuffer flexAsByteBuffer() { return __vector_as_bytebuffer(64, 1); } public ByteBuffer flexInByteBuffer(ByteBuffer _bb) { return __vector_in_bytebuffer(_bb, 64, 1); } public boolean mutateFlex(int j, int flex) { int o = __offset(64); if (o != 0) { bb.put(__vector(o) + j * 1, (byte)flex); return true; } else { return false; } } - public Test test5(int j) { return test5(new Test(), j); } - public Test test5(Test obj, int j) { int o = __offset(66); return o != 0 ? obj.__assign(__vector(o) + j * 4, bb) : null; } + public MyGame.Example.Test test5(int j) { return test5(new MyGame.Example.Test(), j); } + public MyGame.Example.Test test5(MyGame.Example.Test obj, int j) { int o = __offset(66); return o != 0 ? obj.__assign(__vector(o) + j * 4, bb) : null; } public int test5Length() { int o = __offset(66); return o != 0 ? __vector_len(o) : 0; } public long vectorOfLongs(int j) { int o = __offset(68); return o != 0 ? bb.getLong(__vector(o) + j * 8) : 0; } public int vectorOfLongsLength() { int o = __offset(68); return o != 0 ? __vector_len(o) : 0; } @@ -116,11 +116,11 @@ public final class Monster extends Table { public boolean mutateVectorOfDoubles(int j, double vector_of_doubles) { int o = __offset(70); if (o != 0) { bb.putDouble(__vector(o) + j * 8, vector_of_doubles); return true; } else { return false; } } public MyGame.InParentNamespace parentNamespaceTest() { return parentNamespaceTest(new MyGame.InParentNamespace()); } public MyGame.InParentNamespace parentNamespaceTest(MyGame.InParentNamespace obj) { int o = __offset(72); return o != 0 ? obj.__assign(__indirect(o + bb_pos), bb) : null; } - public Referrable vectorOfReferrables(int j) { return vectorOfReferrables(new Referrable(), j); } - public Referrable vectorOfReferrables(Referrable obj, int j) { int o = __offset(74); return o != 0 ? obj.__assign(__indirect(__vector(o) + j * 4), bb) : null; } + public MyGame.Example.Referrable vectorOfReferrables(int j) { return vectorOfReferrables(new MyGame.Example.Referrable(), j); } + public MyGame.Example.Referrable vectorOfReferrables(MyGame.Example.Referrable obj, int j) { int o = __offset(74); return o != 0 ? obj.__assign(__indirect(__vector(o) + j * 4), bb) : null; } public int vectorOfReferrablesLength() { int o = __offset(74); return o != 0 ? __vector_len(o) : 0; } - public Referrable vectorOfReferrablesByKey(long key) { int o = __offset(74); return o != 0 ? Referrable.__lookup_by_key(null, __vector(o), key, bb) : null; } - public Referrable vectorOfReferrablesByKey(Referrable obj, long key) { int o = __offset(74); return o != 0 ? Referrable.__lookup_by_key(obj, __vector(o), key, bb) : null; } + public MyGame.Example.Referrable vectorOfReferrablesByKey(long key) { int o = __offset(74); return o != 0 ? MyGame.Example.Referrable.__lookup_by_key(null, __vector(o), key, bb) : null; } + public MyGame.Example.Referrable vectorOfReferrablesByKey(MyGame.Example.Referrable obj, long key) { int o = __offset(74); return o != 0 ? MyGame.Example.Referrable.__lookup_by_key(obj, __vector(o), key, bb) : null; } public long singleWeakReference() { int o = __offset(76); return o != 0 ? bb.getLong(o + bb_pos) : 0L; } public boolean mutateSingleWeakReference(long single_weak_reference) { int o = __offset(76); if (o != 0) { bb.putLong(o + bb_pos, single_weak_reference); return true; } else { return false; } } public long vectorOfWeakReferences(int j) { int o = __offset(78); return o != 0 ? bb.getLong(__vector(o) + j * 8) : 0; } @@ -128,11 +128,11 @@ public final class Monster extends Table { public ByteBuffer vectorOfWeakReferencesAsByteBuffer() { return __vector_as_bytebuffer(78, 8); } public ByteBuffer vectorOfWeakReferencesInByteBuffer(ByteBuffer _bb) { return __vector_in_bytebuffer(_bb, 78, 8); } public boolean mutateVectorOfWeakReferences(int j, long vector_of_weak_references) { int o = __offset(78); if (o != 0) { bb.putLong(__vector(o) + j * 8, vector_of_weak_references); return true; } else { return false; } } - public Referrable vectorOfStrongReferrables(int j) { return vectorOfStrongReferrables(new Referrable(), j); } - public Referrable vectorOfStrongReferrables(Referrable obj, int j) { int o = __offset(80); return o != 0 ? obj.__assign(__indirect(__vector(o) + j * 4), bb) : null; } + public MyGame.Example.Referrable vectorOfStrongReferrables(int j) { return vectorOfStrongReferrables(new MyGame.Example.Referrable(), j); } + public MyGame.Example.Referrable vectorOfStrongReferrables(MyGame.Example.Referrable obj, int j) { int o = __offset(80); return o != 0 ? obj.__assign(__indirect(__vector(o) + j * 4), bb) : null; } public int vectorOfStrongReferrablesLength() { int o = __offset(80); return o != 0 ? __vector_len(o) : 0; } - public Referrable vectorOfStrongReferrablesByKey(long key) { int o = __offset(80); return o != 0 ? Referrable.__lookup_by_key(null, __vector(o), key, bb) : null; } - public Referrable vectorOfStrongReferrablesByKey(Referrable obj, long key) { int o = __offset(80); return o != 0 ? Referrable.__lookup_by_key(obj, __vector(o), key, bb) : null; } + public MyGame.Example.Referrable vectorOfStrongReferrablesByKey(long key) { int o = __offset(80); return o != 0 ? MyGame.Example.Referrable.__lookup_by_key(null, __vector(o), key, bb) : null; } + public MyGame.Example.Referrable vectorOfStrongReferrablesByKey(MyGame.Example.Referrable obj, long key) { int o = __offset(80); return o != 0 ? MyGame.Example.Referrable.__lookup_by_key(obj, __vector(o), key, bb) : null; } public long coOwningReference() { int o = __offset(82); return o != 0 ? bb.getLong(o + bb_pos) : 0L; } public boolean mutateCoOwningReference(long co_owning_reference) { int o = __offset(82); if (o != 0) { bb.putLong(o + bb_pos, co_owning_reference); return true; } else { return false; } } public long vectorOfCoOwningReferences(int j) { int o = __offset(84); return o != 0 ? bb.getLong(__vector(o) + j * 8) : 0; } diff --git a/tests/MyGame/Example/Referrable.cs b/tests/MyGame/Example/Referrable.cs index 0dc5f4443..d3043532d 100644 --- a/tests/MyGame/Example/Referrable.cs +++ b/tests/MyGame/Example/Referrable.cs @@ -20,7 +20,7 @@ public struct Referrable : IFlatbufferObject public ulong Id { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetUlong(o + __p.bb_pos) : (ulong)0; } } public bool MutateId(ulong id) { int o = __p.__offset(4); if (o != 0) { __p.bb.PutUlong(o + __p.bb_pos, id); return true; } else { return false; } } - public static Offset CreateReferrable(FlatBufferBuilder builder, + public static Offset CreateReferrable(FlatBufferBuilder builder, ulong id = 0) { builder.StartTable(1); Referrable.AddId(builder, id); @@ -29,9 +29,9 @@ public struct Referrable : IFlatbufferObject public static void StartReferrable(FlatBufferBuilder builder) { builder.StartTable(1); } public static void AddId(FlatBufferBuilder builder, ulong id) { builder.AddUlong(0, id, 0); } - public static Offset EndReferrable(FlatBufferBuilder builder) { + public static Offset EndReferrable(FlatBufferBuilder builder) { int o = builder.EndTable(); - return new Offset(o); + return new Offset(o); } public static VectorOffset CreateSortedVectorOfReferrable(FlatBufferBuilder builder, Offset[] offsets) { diff --git a/tests/MyGame/Example/Stat.cs b/tests/MyGame/Example/Stat.cs index 6148bed9a..94b729a95 100644 --- a/tests/MyGame/Example/Stat.cs +++ b/tests/MyGame/Example/Stat.cs @@ -29,7 +29,7 @@ public struct Stat : IFlatbufferObject public ushort Count { get { int o = __p.__offset(8); return o != 0 ? __p.bb.GetUshort(o + __p.bb_pos) : (ushort)0; } } public bool MutateCount(ushort count) { int o = __p.__offset(8); if (o != 0) { __p.bb.PutUshort(o + __p.bb_pos, count); return true; } else { return false; } } - public static Offset CreateStat(FlatBufferBuilder builder, + public static Offset CreateStat(FlatBufferBuilder builder, StringOffset idOffset = default(StringOffset), long val = 0, ushort count = 0) { @@ -44,9 +44,9 @@ public struct Stat : IFlatbufferObject public static void AddId(FlatBufferBuilder builder, StringOffset idOffset) { builder.AddOffset(0, idOffset.Value, 0); } public static void AddVal(FlatBufferBuilder builder, long val) { builder.AddLong(1, val, 0); } public static void AddCount(FlatBufferBuilder builder, ushort count) { builder.AddUshort(2, count, 0); } - public static Offset EndStat(FlatBufferBuilder builder) { + public static Offset EndStat(FlatBufferBuilder builder) { int o = builder.EndTable(); - return new Offset(o); + return new Offset(o); } }; diff --git a/tests/MyGame/Example/Test.cs b/tests/MyGame/Example/Test.cs index 184213160..e37819d9c 100644 --- a/tests/MyGame/Example/Test.cs +++ b/tests/MyGame/Example/Test.cs @@ -20,12 +20,12 @@ public struct Test : IFlatbufferObject public sbyte B { get { return __p.bb.GetSbyte(__p.bb_pos + 2); } } public void MutateB(sbyte b) { __p.bb.PutSbyte(__p.bb_pos + 2, b); } - public static Offset CreateTest(FlatBufferBuilder builder, short A, sbyte B) { + public static Offset CreateTest(FlatBufferBuilder builder, short A, sbyte B) { builder.Prep(2, 4); builder.Pad(1); builder.PutSbyte(B); builder.PutShort(A); - return new Offset(builder.Offset); + return new Offset(builder.Offset); } }; diff --git a/tests/MyGame/Example/TestSimpleTableWithEnum.cs b/tests/MyGame/Example/TestSimpleTableWithEnum.cs index a03ab3306..f765bec02 100644 --- a/tests/MyGame/Example/TestSimpleTableWithEnum.cs +++ b/tests/MyGame/Example/TestSimpleTableWithEnum.cs @@ -17,21 +17,21 @@ internal partial struct TestSimpleTableWithEnum : IFlatbufferObject public void __init(int _i, ByteBuffer _bb) { __p.bb_pos = _i; __p.bb = _bb; } public TestSimpleTableWithEnum __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } - public Color Color { get { int o = __p.__offset(4); return o != 0 ? (Color)__p.bb.Get(o + __p.bb_pos) : Color.Green; } } - public bool MutateColor(Color color) { int o = __p.__offset(4); if (o != 0) { __p.bb.Put(o + __p.bb_pos, (byte)color); return true; } else { return false; } } + public MyGame.Example.Color Color { get { int o = __p.__offset(4); return o != 0 ? (MyGame.Example.Color)__p.bb.Get(o + __p.bb_pos) : MyGame.Example.Color.Green; } } + public bool MutateColor(MyGame.Example.Color color) { int o = __p.__offset(4); if (o != 0) { __p.bb.Put(o + __p.bb_pos, (byte)color); return true; } else { return false; } } - public static Offset CreateTestSimpleTableWithEnum(FlatBufferBuilder builder, - Color color = Color.Green) { + public static Offset CreateTestSimpleTableWithEnum(FlatBufferBuilder builder, + MyGame.Example.Color color = MyGame.Example.Color.Green) { builder.StartTable(1); TestSimpleTableWithEnum.AddColor(builder, color); return TestSimpleTableWithEnum.EndTestSimpleTableWithEnum(builder); } public static void StartTestSimpleTableWithEnum(FlatBufferBuilder builder) { builder.StartTable(1); } - public static void AddColor(FlatBufferBuilder builder, Color color) { builder.AddByte(0, (byte)color, 2); } - public static Offset EndTestSimpleTableWithEnum(FlatBufferBuilder builder) { + public static void AddColor(FlatBufferBuilder builder, MyGame.Example.Color color) { builder.AddByte(0, (byte)color, 2); } + public static Offset EndTestSimpleTableWithEnum(FlatBufferBuilder builder) { int o = builder.EndTable(); - return new Offset(o); + return new Offset(o); } }; diff --git a/tests/MyGame/Example/TypeAliases.cs b/tests/MyGame/Example/TypeAliases.cs index 37dfeba32..3a2760681 100644 --- a/tests/MyGame/Example/TypeAliases.cs +++ b/tests/MyGame/Example/TypeAliases.cs @@ -56,7 +56,7 @@ public struct TypeAliases : IFlatbufferObject public double[] GetVf64Array() { return __p.__vector_as_array(26); } public bool MutateVf64(int j, double vf64) { int o = __p.__offset(26); if (o != 0) { __p.bb.PutDouble(__p.__vector(o) + j * 8, vf64); return true; } else { return false; } } - public static Offset CreateTypeAliases(FlatBufferBuilder builder, + public static Offset CreateTypeAliases(FlatBufferBuilder builder, sbyte i8 = 0, byte u8 = 0, short i16 = 0, @@ -104,9 +104,9 @@ public struct TypeAliases : IFlatbufferObject public static VectorOffset CreateVf64Vector(FlatBufferBuilder builder, double[] data) { builder.StartVector(8, data.Length, 8); for (int i = data.Length - 1; i >= 0; i--) builder.AddDouble(data[i]); return builder.EndVector(); } public static VectorOffset CreateVf64VectorBlock(FlatBufferBuilder builder, double[] data) { builder.StartVector(8, data.Length, 8); builder.Add(data); return builder.EndVector(); } public static void StartVf64Vector(FlatBufferBuilder builder, int numElems) { builder.StartVector(8, numElems, 8); } - public static Offset EndTypeAliases(FlatBufferBuilder builder) { + public static Offset EndTypeAliases(FlatBufferBuilder builder) { int o = builder.EndTable(); - return new Offset(o); + return new Offset(o); } }; diff --git a/tests/MyGame/Example/Vec3.cs b/tests/MyGame/Example/Vec3.cs index 88e1c57da..c6d268efe 100644 --- a/tests/MyGame/Example/Vec3.cs +++ b/tests/MyGame/Example/Vec3.cs @@ -23,11 +23,11 @@ public struct Vec3 : IFlatbufferObject public void MutateZ(float z) { __p.bb.PutFloat(__p.bb_pos + 8, z); } public double Test1 { get { return __p.bb.GetDouble(__p.bb_pos + 16); } } public void MutateTest1(double test1) { __p.bb.PutDouble(__p.bb_pos + 16, test1); } - public Color Test2 { get { return (Color)__p.bb.Get(__p.bb_pos + 24); } } - public void MutateTest2(Color test2) { __p.bb.Put(__p.bb_pos + 24, (byte)test2); } - public Test Test3 { get { return (new Test()).__assign(__p.bb_pos + 26, __p.bb); } } + public MyGame.Example.Color Test2 { get { return (MyGame.Example.Color)__p.bb.Get(__p.bb_pos + 24); } } + public void MutateTest2(MyGame.Example.Color test2) { __p.bb.Put(__p.bb_pos + 24, (byte)test2); } + public MyGame.Example.Test Test3 { get { return (new MyGame.Example.Test()).__assign(__p.bb_pos + 26, __p.bb); } } - public static Offset CreateVec3(FlatBufferBuilder builder, float X, float Y, float Z, double Test1, Color Test2, short test3_A, sbyte test3_B) { + public static Offset CreateVec3(FlatBufferBuilder builder, float X, float Y, float Z, double Test1, MyGame.Example.Color Test2, short test3_A, sbyte test3_B) { builder.Prep(8, 32); builder.Pad(2); builder.Prep(2, 4); @@ -41,7 +41,7 @@ public struct Vec3 : IFlatbufferObject builder.PutFloat(Z); builder.PutFloat(Y); builder.PutFloat(X); - return new Offset(builder.Offset); + return new Offset(builder.Offset); } }; diff --git a/tests/MyGame/Example/Vec3.java b/tests/MyGame/Example/Vec3.java index f97e02268..fe205e7ba 100644 --- a/tests/MyGame/Example/Vec3.java +++ b/tests/MyGame/Example/Vec3.java @@ -22,8 +22,8 @@ public final class Vec3 extends Struct { public void mutateTest1(double test1) { bb.putDouble(bb_pos + 16, test1); } public int test2() { return bb.get(bb_pos + 24) & 0xFF; } public void mutateTest2(int test2) { bb.put(bb_pos + 24, (byte)test2); } - public Test test3() { return test3(new Test()); } - public Test test3(Test obj) { return obj.__assign(bb_pos + 26, bb); } + public MyGame.Example.Test test3() { return test3(new MyGame.Example.Test()); } + public MyGame.Example.Test test3(MyGame.Example.Test obj) { return obj.__assign(bb_pos + 26, bb); } public static int createVec3(FlatBufferBuilder builder, float x, float y, float z, double test1, int test2, short test3_a, byte test3_b) { builder.prep(8, 32); diff --git a/tests/MyGame/Example2/Monster.cs b/tests/MyGame/Example2/Monster.cs index d365e790f..f689a7fcf 100644 --- a/tests/MyGame/Example2/Monster.cs +++ b/tests/MyGame/Example2/Monster.cs @@ -19,9 +19,9 @@ public struct Monster : IFlatbufferObject public static void StartMonster(FlatBufferBuilder builder) { builder.StartTable(0); } - public static Offset EndMonster(FlatBufferBuilder builder) { + public static Offset EndMonster(FlatBufferBuilder builder) { int o = builder.EndTable(); - return new Offset(o); + return new Offset(o); } }; diff --git a/tests/MyGame/InParentNamespace.cs b/tests/MyGame/InParentNamespace.cs index 0e2bf7446..cf17bcaaf 100644 --- a/tests/MyGame/InParentNamespace.cs +++ b/tests/MyGame/InParentNamespace.cs @@ -19,9 +19,9 @@ public struct InParentNamespace : IFlatbufferObject public static void StartInParentNamespace(FlatBufferBuilder builder) { builder.StartTable(0); } - public static Offset EndInParentNamespace(FlatBufferBuilder builder) { + public static Offset EndInParentNamespace(FlatBufferBuilder builder) { int o = builder.EndTable(); - return new Offset(o); + return new Offset(o); } }; diff --git a/tests/MyGame/MonsterExtra.cs b/tests/MyGame/MonsterExtra.cs index 56df4d912..80b09bdc5 100644 --- a/tests/MyGame/MonsterExtra.cs +++ b/tests/MyGame/MonsterExtra.cs @@ -49,7 +49,7 @@ public struct MonsterExtra : IFlatbufferObject public double[] GetTestdVecArray() { return __p.__vector_as_array(18); } public bool MutateTestdVec(int j, double testd_vec) { int o = __p.__offset(18); if (o != 0) { __p.bb.PutDouble(__p.__vector(o) + j * 8, testd_vec); return true; } else { return false; } } - public static Offset CreateMonsterExtra(FlatBufferBuilder builder, + public static Offset CreateMonsterExtra(FlatBufferBuilder builder, float testf_nan = Single.NaN, float testf_pinf = Single.PositiveInfinity, float testf_ninf = Single.NegativeInfinity, @@ -85,12 +85,12 @@ public struct MonsterExtra : IFlatbufferObject public static VectorOffset CreateTestdVecVector(FlatBufferBuilder builder, double[] data) { builder.StartVector(8, data.Length, 8); for (int i = data.Length - 1; i >= 0; i--) builder.AddDouble(data[i]); return builder.EndVector(); } public static VectorOffset CreateTestdVecVectorBlock(FlatBufferBuilder builder, double[] data) { builder.StartVector(8, data.Length, 8); builder.Add(data); return builder.EndVector(); } public static void StartTestdVecVector(FlatBufferBuilder builder, int numElems) { builder.StartVector(8, numElems, 8); } - public static Offset EndMonsterExtra(FlatBufferBuilder builder) { + public static Offset EndMonsterExtra(FlatBufferBuilder builder) { int o = builder.EndTable(); - return new Offset(o); + return new Offset(o); } - public static void FinishMonsterExtraBuffer(FlatBufferBuilder builder, Offset offset) { builder.Finish(offset.Value, "MONE"); } - public static void FinishSizePrefixedMonsterExtraBuffer(FlatBufferBuilder builder, Offset offset) { builder.FinishSizePrefixed(offset.Value, "MONE"); } + public static void FinishMonsterExtraBuffer(FlatBufferBuilder builder, Offset offset) { builder.Finish(offset.Value, "MONE"); } + public static void FinishSizePrefixedMonsterExtraBuffer(FlatBufferBuilder builder, Offset offset) { builder.FinishSizePrefixed(offset.Value, "MONE"); } }; diff --git a/tests/monster_extra_generated.h b/tests/monster_extra_generated.h index 6ad3ca851..13d8a8beb 100644 --- a/tests/monster_extra_generated.h +++ b/tests/monster_extra_generated.h @@ -343,16 +343,16 @@ inline void FinishSizePrefixedMonsterExtraBuffer( fbb.FinishSizePrefixed(root, MonsterExtraIdentifier()); } -inline std::unique_ptr UnPackMonsterExtra( +inline std::unique_ptr UnPackMonsterExtra( const void *buf, const flatbuffers::resolver_function_t *res = nullptr) { - return std::unique_ptr(GetMonsterExtra(buf)->UnPack(res)); + return std::unique_ptr(GetMonsterExtra(buf)->UnPack(res)); } -inline std::unique_ptr UnPackSizePrefixedMonsterExtra( +inline std::unique_ptr UnPackSizePrefixedMonsterExtra( const void *buf, const flatbuffers::resolver_function_t *res = nullptr) { - return std::unique_ptr(GetSizePrefixedMonsterExtra(buf)->UnPack(res)); + return std::unique_ptr(GetSizePrefixedMonsterExtra(buf)->UnPack(res)); } } // namespace MyGame diff --git a/tests/monster_test_generated.h b/tests/monster_test_generated.h index 661933c8d..4016ce9dc 100644 --- a/tests/monster_test_generated.h +++ b/tests/monster_test_generated.h @@ -181,11 +181,11 @@ template struct AnyTraits { static const Any enum_value = Any_NONE; }; -template<> struct AnyTraits { +template<> struct AnyTraits { static const Any enum_value = Any_Monster; }; -template<> struct AnyTraits { +template<> struct AnyTraits { static const Any enum_value = Any_TestSimpleTableWithEnum; }; @@ -225,21 +225,21 @@ struct AnyUnion { static void *UnPack(const void *obj, Any type, const flatbuffers::resolver_function_t *resolver); flatbuffers::Offset Pack(flatbuffers::FlatBufferBuilder &_fbb, const flatbuffers::rehasher_function_t *_rehasher = nullptr) const; - MonsterT *AsMonster() { + MyGame::Example::MonsterT *AsMonster() { return type == Any_Monster ? - reinterpret_cast(value) : nullptr; + reinterpret_cast(value) : nullptr; } - const MonsterT *AsMonster() const { + const MyGame::Example::MonsterT *AsMonster() const { return type == Any_Monster ? - reinterpret_cast(value) : nullptr; + reinterpret_cast(value) : nullptr; } - TestSimpleTableWithEnumT *AsTestSimpleTableWithEnum() { + MyGame::Example::TestSimpleTableWithEnumT *AsTestSimpleTableWithEnum() { return type == Any_TestSimpleTableWithEnum ? - reinterpret_cast(value) : nullptr; + reinterpret_cast(value) : nullptr; } - const TestSimpleTableWithEnumT *AsTestSimpleTableWithEnum() const { + const MyGame::Example::TestSimpleTableWithEnumT *AsTestSimpleTableWithEnum() const { return type == Any_TestSimpleTableWithEnum ? - reinterpret_cast(value) : nullptr; + reinterpret_cast(value) : nullptr; } MyGame::Example2::MonsterT *AsMyGame_Example2_Monster() { return type == Any_MyGame_Example2_Monster ? @@ -259,12 +259,12 @@ inline bool operator==(const AnyUnion &lhs, const AnyUnion &rhs) { return true; } case Any_Monster: { - return *(reinterpret_cast(lhs.value)) == - *(reinterpret_cast(rhs.value)); + return *(reinterpret_cast(lhs.value)) == + *(reinterpret_cast(rhs.value)); } case Any_TestSimpleTableWithEnum: { - return *(reinterpret_cast(lhs.value)) == - *(reinterpret_cast(rhs.value)); + return *(reinterpret_cast(lhs.value)) == + *(reinterpret_cast(rhs.value)); } case Any_MyGame_Example2_Monster: { return *(reinterpret_cast(lhs.value)) == @@ -323,11 +323,11 @@ template struct AnyUniqueAliasesTraits { static const AnyUniqueAliases enum_value = AnyUniqueAliases_NONE; }; -template<> struct AnyUniqueAliasesTraits { +template<> struct AnyUniqueAliasesTraits { static const AnyUniqueAliases enum_value = AnyUniqueAliases_M; }; -template<> struct AnyUniqueAliasesTraits { +template<> struct AnyUniqueAliasesTraits { static const AnyUniqueAliases enum_value = AnyUniqueAliases_TS; }; @@ -367,21 +367,21 @@ struct AnyUniqueAliasesUnion { static void *UnPack(const void *obj, AnyUniqueAliases type, const flatbuffers::resolver_function_t *resolver); flatbuffers::Offset Pack(flatbuffers::FlatBufferBuilder &_fbb, const flatbuffers::rehasher_function_t *_rehasher = nullptr) const; - MonsterT *AsM() { + MyGame::Example::MonsterT *AsM() { return type == AnyUniqueAliases_M ? - reinterpret_cast(value) : nullptr; + reinterpret_cast(value) : nullptr; } - const MonsterT *AsM() const { + const MyGame::Example::MonsterT *AsM() const { return type == AnyUniqueAliases_M ? - reinterpret_cast(value) : nullptr; + reinterpret_cast(value) : nullptr; } - TestSimpleTableWithEnumT *AsTS() { + MyGame::Example::TestSimpleTableWithEnumT *AsTS() { return type == AnyUniqueAliases_TS ? - reinterpret_cast(value) : nullptr; + reinterpret_cast(value) : nullptr; } - const TestSimpleTableWithEnumT *AsTS() const { + const MyGame::Example::TestSimpleTableWithEnumT *AsTS() const { return type == AnyUniqueAliases_TS ? - reinterpret_cast(value) : nullptr; + reinterpret_cast(value) : nullptr; } MyGame::Example2::MonsterT *AsM2() { return type == AnyUniqueAliases_M2 ? @@ -401,12 +401,12 @@ inline bool operator==(const AnyUniqueAliasesUnion &lhs, const AnyUniqueAliasesU return true; } case AnyUniqueAliases_M: { - return *(reinterpret_cast(lhs.value)) == - *(reinterpret_cast(rhs.value)); + return *(reinterpret_cast(lhs.value)) == + *(reinterpret_cast(rhs.value)); } case AnyUniqueAliases_TS: { - return *(reinterpret_cast(lhs.value)) == - *(reinterpret_cast(rhs.value)); + return *(reinterpret_cast(lhs.value)) == + *(reinterpret_cast(rhs.value)); } case AnyUniqueAliases_M2: { return *(reinterpret_cast(lhs.value)) == @@ -481,29 +481,29 @@ struct AnyAmbiguousAliasesUnion { static void *UnPack(const void *obj, AnyAmbiguousAliases type, const flatbuffers::resolver_function_t *resolver); flatbuffers::Offset Pack(flatbuffers::FlatBufferBuilder &_fbb, const flatbuffers::rehasher_function_t *_rehasher = nullptr) const; - MonsterT *AsM1() { + MyGame::Example::MonsterT *AsM1() { return type == AnyAmbiguousAliases_M1 ? - reinterpret_cast(value) : nullptr; + reinterpret_cast(value) : nullptr; } - const MonsterT *AsM1() const { + const MyGame::Example::MonsterT *AsM1() const { return type == AnyAmbiguousAliases_M1 ? - reinterpret_cast(value) : nullptr; + reinterpret_cast(value) : nullptr; } - MonsterT *AsM2() { + MyGame::Example::MonsterT *AsM2() { return type == AnyAmbiguousAliases_M2 ? - reinterpret_cast(value) : nullptr; + reinterpret_cast(value) : nullptr; } - const MonsterT *AsM2() const { + const MyGame::Example::MonsterT *AsM2() const { return type == AnyAmbiguousAliases_M2 ? - reinterpret_cast(value) : nullptr; + reinterpret_cast(value) : nullptr; } - MonsterT *AsM3() { + MyGame::Example::MonsterT *AsM3() { return type == AnyAmbiguousAliases_M3 ? - reinterpret_cast(value) : nullptr; + reinterpret_cast(value) : nullptr; } - const MonsterT *AsM3() const { + const MyGame::Example::MonsterT *AsM3() const { return type == AnyAmbiguousAliases_M3 ? - reinterpret_cast(value) : nullptr; + reinterpret_cast(value) : nullptr; } }; @@ -515,16 +515,16 @@ inline bool operator==(const AnyAmbiguousAliasesUnion &lhs, const AnyAmbiguousAl return true; } case AnyAmbiguousAliases_M1: { - return *(reinterpret_cast(lhs.value)) == - *(reinterpret_cast(rhs.value)); + return *(reinterpret_cast(lhs.value)) == + *(reinterpret_cast(rhs.value)); } case AnyAmbiguousAliases_M2: { - return *(reinterpret_cast(lhs.value)) == - *(reinterpret_cast(rhs.value)); + return *(reinterpret_cast(lhs.value)) == + *(reinterpret_cast(rhs.value)); } case AnyAmbiguousAliases_M3: { - return *(reinterpret_cast(lhs.value)) == - *(reinterpret_cast(rhs.value)); + return *(reinterpret_cast(lhs.value)) == + *(reinterpret_cast(rhs.value)); } default: { return false; @@ -593,7 +593,7 @@ FLATBUFFERS_MANUALLY_ALIGNED_STRUCT(8) Vec3 FLATBUFFERS_FINAL_CLASS { double test1_; uint8_t test2_; int8_t padding1__; - Test test3_; + MyGame::Example::Test test3_; int16_t padding2__; public: @@ -603,7 +603,7 @@ FLATBUFFERS_MANUALLY_ALIGNED_STRUCT(8) Vec3 FLATBUFFERS_FINAL_CLASS { Vec3() { memset(static_cast(this), 0, sizeof(Vec3)); } - Vec3(float _x, float _y, float _z, double _test1, Color _test2, const Test &_test3) + Vec3(float _x, float _y, float _z, double _test1, MyGame::Example::Color _test2, const MyGame::Example::Test &_test3) : x_(flatbuffers::EndianScalar(_x)), y_(flatbuffers::EndianScalar(_y)), z_(flatbuffers::EndianScalar(_z)), @@ -641,16 +641,16 @@ FLATBUFFERS_MANUALLY_ALIGNED_STRUCT(8) Vec3 FLATBUFFERS_FINAL_CLASS { void mutate_test1(double _test1) { flatbuffers::WriteScalar(&test1_, _test1); } - Color test2() const { - return static_cast(flatbuffers::EndianScalar(test2_)); + MyGame::Example::Color test2() const { + return static_cast(flatbuffers::EndianScalar(test2_)); } - void mutate_test2(Color _test2) { + void mutate_test2(MyGame::Example::Color _test2) { flatbuffers::WriteScalar(&test2_, static_cast(_test2)); } - const Test &test3() const { + const MyGame::Example::Test &test3() const { return test3_; } - Test &mutable_test3() { + MyGame::Example::Test &mutable_test3() { return test3_; } }; @@ -833,9 +833,9 @@ namespace Example { struct TestSimpleTableWithEnumT : public flatbuffers::NativeTable { typedef TestSimpleTableWithEnum TableType; - Color color; + MyGame::Example::Color color; TestSimpleTableWithEnumT() - : color(Color_Green) { + : color(MyGame::Example::Color_Green) { } }; @@ -857,10 +857,10 @@ struct TestSimpleTableWithEnum FLATBUFFERS_FINAL_CLASS : private flatbuffers::Ta enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { VT_COLOR = 4 }; - Color color() const { - return static_cast(GetField(VT_COLOR, 2)); + MyGame::Example::Color color() const { + return static_cast(GetField(VT_COLOR, 2)); } - bool mutate_color(Color _color) { + bool mutate_color(MyGame::Example::Color _color) { return SetField(VT_COLOR, static_cast(_color), 2); } bool Verify(flatbuffers::Verifier &verifier) const { @@ -876,7 +876,7 @@ struct TestSimpleTableWithEnum FLATBUFFERS_FINAL_CLASS : private flatbuffers::Ta struct TestSimpleTableWithEnumBuilder { flatbuffers::FlatBufferBuilder &fbb_; flatbuffers::uoffset_t start_; - void add_color(Color color) { + void add_color(MyGame::Example::Color color) { fbb_.AddElement(TestSimpleTableWithEnum::VT_COLOR, static_cast(color), 2); } explicit TestSimpleTableWithEnumBuilder(flatbuffers::FlatBufferBuilder &_fbb) @@ -893,7 +893,7 @@ struct TestSimpleTableWithEnumBuilder { inline flatbuffers::Offset CreateTestSimpleTableWithEnum( flatbuffers::FlatBufferBuilder &_fbb, - Color color = Color_Green) { + MyGame::Example::Color color = MyGame::Example::Color_Green) { TestSimpleTableWithEnumBuilder builder_(_fbb); builder_.add_color(color); return builder_.Finish(); @@ -1094,19 +1094,19 @@ flatbuffers::Offset CreateReferrable(flatbuffers::FlatBufferBuilder struct MonsterT : public flatbuffers::NativeTable { typedef Monster TableType; - flatbuffers::unique_ptr pos; + flatbuffers::unique_ptr pos; int16_t mana; int16_t hp; std::string name; std::vector inventory; - Color color; + MyGame::Example::Color color; AnyUnion test; - std::vector test4; + std::vector test4; std::vector testarrayofstring; - std::vector> testarrayoftables; - flatbuffers::unique_ptr enemy; + std::vector> testarrayoftables; + flatbuffers::unique_ptr enemy; std::vector testnestedflatbuffer; - flatbuffers::unique_ptr testempty; + flatbuffers::unique_ptr testempty; bool testbool; int32_t testhashs32_fnv1; uint32_t testhashu32_fnv1; @@ -1121,27 +1121,27 @@ struct MonsterT : public flatbuffers::NativeTable { float testf2; float testf3; std::vector testarrayofstring2; - std::vector testarrayofsortedstruct; + std::vector testarrayofsortedstruct; std::vector flex; - std::vector test5; + std::vector test5; std::vector vector_of_longs; std::vector vector_of_doubles; flatbuffers::unique_ptr parent_namespace_test; - std::vector> vector_of_referrables; + std::vector> vector_of_referrables; ReferrableT *single_weak_reference; std::vector vector_of_weak_references; - std::vector> vector_of_strong_referrables; + std::vector> vector_of_strong_referrables; ReferrableT *co_owning_reference; std::vector> vector_of_co_owning_references; ReferrableT *non_owning_reference; std::vector vector_of_non_owning_references; AnyUniqueAliasesUnion any_unique; AnyAmbiguousAliasesUnion any_ambiguous; - std::vector vector_of_enums; + std::vector vector_of_enums; MonsterT() : mana(150), hp(100), - color(Color_Blue), + color(MyGame::Example::Color_Blue), testbool(false), testhashs32_fnv1(0), testhashu32_fnv1(0), @@ -1268,11 +1268,11 @@ struct Monster FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { VT_ANY_AMBIGUOUS = 96, VT_VECTOR_OF_ENUMS = 98 }; - const Vec3 *pos() const { - return GetStruct(VT_POS); + const MyGame::Example::Vec3 *pos() const { + return GetStruct(VT_POS); } - Vec3 *mutable_pos() { - return GetStruct(VT_POS); + MyGame::Example::Vec3 *mutable_pos() { + return GetStruct(VT_POS); } int16_t mana() const { return GetField(VT_MANA, 150); @@ -1304,39 +1304,39 @@ struct Monster FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { flatbuffers::Vector *mutable_inventory() { return GetPointer *>(VT_INVENTORY); } - Color color() const { - return static_cast(GetField(VT_COLOR, 8)); + MyGame::Example::Color color() const { + return static_cast(GetField(VT_COLOR, 8)); } - bool mutate_color(Color _color) { + bool mutate_color(MyGame::Example::Color _color) { return SetField(VT_COLOR, static_cast(_color), 8); } - Any test_type() const { - return static_cast(GetField(VT_TEST_TYPE, 0)); + MyGame::Example::Any test_type() const { + return static_cast(GetField(VT_TEST_TYPE, 0)); } - bool mutate_test_type(Any _test_type) { + bool mutate_test_type(MyGame::Example::Any _test_type) { return SetField(VT_TEST_TYPE, static_cast(_test_type), 0); } const void *test() const { return GetPointer(VT_TEST); } template const T *test_as() const; - const Monster *test_as_Monster() const { - return test_type() == Any_Monster ? static_cast(test()) : nullptr; + const MyGame::Example::Monster *test_as_Monster() const { + return test_type() == MyGame::Example::Any_Monster ? static_cast(test()) : nullptr; } - const TestSimpleTableWithEnum *test_as_TestSimpleTableWithEnum() const { - return test_type() == Any_TestSimpleTableWithEnum ? static_cast(test()) : nullptr; + const MyGame::Example::TestSimpleTableWithEnum *test_as_TestSimpleTableWithEnum() const { + return test_type() == MyGame::Example::Any_TestSimpleTableWithEnum ? static_cast(test()) : nullptr; } const MyGame::Example2::Monster *test_as_MyGame_Example2_Monster() const { - return test_type() == Any_MyGame_Example2_Monster ? static_cast(test()) : nullptr; + return test_type() == MyGame::Example::Any_MyGame_Example2_Monster ? static_cast(test()) : nullptr; } void *mutable_test() { return GetPointer(VT_TEST); } - const flatbuffers::Vector *test4() const { - return GetPointer *>(VT_TEST4); + const flatbuffers::Vector *test4() const { + return GetPointer *>(VT_TEST4); } - flatbuffers::Vector *mutable_test4() { - return GetPointer *>(VT_TEST4); + flatbuffers::Vector *mutable_test4() { + return GetPointer *>(VT_TEST4); } const flatbuffers::Vector> *testarrayofstring() const { return GetPointer> *>(VT_TESTARRAYOFSTRING); @@ -1346,17 +1346,17 @@ struct Monster FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { } /// an example documentation comment: this will end up in the generated code /// multiline too - const flatbuffers::Vector> *testarrayoftables() const { - return GetPointer> *>(VT_TESTARRAYOFTABLES); + const flatbuffers::Vector> *testarrayoftables() const { + return GetPointer> *>(VT_TESTARRAYOFTABLES); } - flatbuffers::Vector> *mutable_testarrayoftables() { - return GetPointer> *>(VT_TESTARRAYOFTABLES); + flatbuffers::Vector> *mutable_testarrayoftables() { + return GetPointer> *>(VT_TESTARRAYOFTABLES); } - const Monster *enemy() const { - return GetPointer(VT_ENEMY); + const MyGame::Example::Monster *enemy() const { + return GetPointer(VT_ENEMY); } - Monster *mutable_enemy() { - return GetPointer(VT_ENEMY); + MyGame::Example::Monster *mutable_enemy() { + return GetPointer(VT_ENEMY); } const flatbuffers::Vector *testnestedflatbuffer() const { return GetPointer *>(VT_TESTNESTEDFLATBUFFER); @@ -1367,11 +1367,11 @@ struct Monster FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { const MyGame::Example::Monster *testnestedflatbuffer_nested_root() const { return flatbuffers::GetRoot(testnestedflatbuffer()->Data()); } - const Stat *testempty() const { - return GetPointer(VT_TESTEMPTY); + const MyGame::Example::Stat *testempty() const { + return GetPointer(VT_TESTEMPTY); } - Stat *mutable_testempty() { - return GetPointer(VT_TESTEMPTY); + MyGame::Example::Stat *mutable_testempty() { + return GetPointer(VT_TESTEMPTY); } bool testbool() const { return GetField(VT_TESTBOOL, 0) != 0; @@ -1457,11 +1457,11 @@ struct Monster FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { flatbuffers::Vector> *mutable_testarrayofstring2() { return GetPointer> *>(VT_TESTARRAYOFSTRING2); } - const flatbuffers::Vector *testarrayofsortedstruct() const { - return GetPointer *>(VT_TESTARRAYOFSORTEDSTRUCT); + const flatbuffers::Vector *testarrayofsortedstruct() const { + return GetPointer *>(VT_TESTARRAYOFSORTEDSTRUCT); } - flatbuffers::Vector *mutable_testarrayofsortedstruct() { - return GetPointer *>(VT_TESTARRAYOFSORTEDSTRUCT); + flatbuffers::Vector *mutable_testarrayofsortedstruct() { + return GetPointer *>(VT_TESTARRAYOFSORTEDSTRUCT); } const flatbuffers::Vector *flex() const { return GetPointer *>(VT_FLEX); @@ -1472,11 +1472,11 @@ struct Monster FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { flexbuffers::Reference flex_flexbuffer_root() const { return flexbuffers::GetRoot(flex()->Data(), flex()->size()); } - const flatbuffers::Vector *test5() const { - return GetPointer *>(VT_TEST5); + const flatbuffers::Vector *test5() const { + return GetPointer *>(VT_TEST5); } - flatbuffers::Vector *mutable_test5() { - return GetPointer *>(VT_TEST5); + flatbuffers::Vector *mutable_test5() { + return GetPointer *>(VT_TEST5); } const flatbuffers::Vector *vector_of_longs() const { return GetPointer *>(VT_VECTOR_OF_LONGS); @@ -1496,11 +1496,11 @@ struct Monster FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { MyGame::InParentNamespace *mutable_parent_namespace_test() { return GetPointer(VT_PARENT_NAMESPACE_TEST); } - const flatbuffers::Vector> *vector_of_referrables() const { - return GetPointer> *>(VT_VECTOR_OF_REFERRABLES); + const flatbuffers::Vector> *vector_of_referrables() const { + return GetPointer> *>(VT_VECTOR_OF_REFERRABLES); } - flatbuffers::Vector> *mutable_vector_of_referrables() { - return GetPointer> *>(VT_VECTOR_OF_REFERRABLES); + flatbuffers::Vector> *mutable_vector_of_referrables() { + return GetPointer> *>(VT_VECTOR_OF_REFERRABLES); } uint64_t single_weak_reference() const { return GetField(VT_SINGLE_WEAK_REFERENCE, 0); @@ -1514,11 +1514,11 @@ struct Monster FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { flatbuffers::Vector *mutable_vector_of_weak_references() { return GetPointer *>(VT_VECTOR_OF_WEAK_REFERENCES); } - const flatbuffers::Vector> *vector_of_strong_referrables() const { - return GetPointer> *>(VT_VECTOR_OF_STRONG_REFERRABLES); + const flatbuffers::Vector> *vector_of_strong_referrables() const { + return GetPointer> *>(VT_VECTOR_OF_STRONG_REFERRABLES); } - flatbuffers::Vector> *mutable_vector_of_strong_referrables() { - return GetPointer> *>(VT_VECTOR_OF_STRONG_REFERRABLES); + flatbuffers::Vector> *mutable_vector_of_strong_referrables() { + return GetPointer> *>(VT_VECTOR_OF_STRONG_REFERRABLES); } uint64_t co_owning_reference() const { return GetField(VT_CO_OWNING_REFERENCE, 0); @@ -1544,45 +1544,45 @@ struct Monster FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { flatbuffers::Vector *mutable_vector_of_non_owning_references() { return GetPointer *>(VT_VECTOR_OF_NON_OWNING_REFERENCES); } - AnyUniqueAliases any_unique_type() const { - return static_cast(GetField(VT_ANY_UNIQUE_TYPE, 0)); + MyGame::Example::AnyUniqueAliases any_unique_type() const { + return static_cast(GetField(VT_ANY_UNIQUE_TYPE, 0)); } - bool mutate_any_unique_type(AnyUniqueAliases _any_unique_type) { + bool mutate_any_unique_type(MyGame::Example::AnyUniqueAliases _any_unique_type) { return SetField(VT_ANY_UNIQUE_TYPE, static_cast(_any_unique_type), 0); } const void *any_unique() const { return GetPointer(VT_ANY_UNIQUE); } template const T *any_unique_as() const; - const Monster *any_unique_as_M() const { - return any_unique_type() == AnyUniqueAliases_M ? static_cast(any_unique()) : nullptr; + const MyGame::Example::Monster *any_unique_as_M() const { + return any_unique_type() == MyGame::Example::AnyUniqueAliases_M ? static_cast(any_unique()) : nullptr; } - const TestSimpleTableWithEnum *any_unique_as_TS() const { - return any_unique_type() == AnyUniqueAliases_TS ? static_cast(any_unique()) : nullptr; + const MyGame::Example::TestSimpleTableWithEnum *any_unique_as_TS() const { + return any_unique_type() == MyGame::Example::AnyUniqueAliases_TS ? static_cast(any_unique()) : nullptr; } const MyGame::Example2::Monster *any_unique_as_M2() const { - return any_unique_type() == AnyUniqueAliases_M2 ? static_cast(any_unique()) : nullptr; + return any_unique_type() == MyGame::Example::AnyUniqueAliases_M2 ? static_cast(any_unique()) : nullptr; } void *mutable_any_unique() { return GetPointer(VT_ANY_UNIQUE); } - AnyAmbiguousAliases any_ambiguous_type() const { - return static_cast(GetField(VT_ANY_AMBIGUOUS_TYPE, 0)); + MyGame::Example::AnyAmbiguousAliases any_ambiguous_type() const { + return static_cast(GetField(VT_ANY_AMBIGUOUS_TYPE, 0)); } - bool mutate_any_ambiguous_type(AnyAmbiguousAliases _any_ambiguous_type) { + bool mutate_any_ambiguous_type(MyGame::Example::AnyAmbiguousAliases _any_ambiguous_type) { return SetField(VT_ANY_AMBIGUOUS_TYPE, static_cast(_any_ambiguous_type), 0); } const void *any_ambiguous() const { return GetPointer(VT_ANY_AMBIGUOUS); } - const Monster *any_ambiguous_as_M1() const { - return any_ambiguous_type() == AnyAmbiguousAliases_M1 ? static_cast(any_ambiguous()) : nullptr; + const MyGame::Example::Monster *any_ambiguous_as_M1() const { + return any_ambiguous_type() == MyGame::Example::AnyAmbiguousAliases_M1 ? static_cast(any_ambiguous()) : nullptr; } - const Monster *any_ambiguous_as_M2() const { - return any_ambiguous_type() == AnyAmbiguousAliases_M2 ? static_cast(any_ambiguous()) : nullptr; + const MyGame::Example::Monster *any_ambiguous_as_M2() const { + return any_ambiguous_type() == MyGame::Example::AnyAmbiguousAliases_M2 ? static_cast(any_ambiguous()) : nullptr; } - const Monster *any_ambiguous_as_M3() const { - return any_ambiguous_type() == AnyAmbiguousAliases_M3 ? static_cast(any_ambiguous()) : nullptr; + const MyGame::Example::Monster *any_ambiguous_as_M3() const { + return any_ambiguous_type() == MyGame::Example::AnyAmbiguousAliases_M3 ? static_cast(any_ambiguous()) : nullptr; } void *mutable_any_ambiguous() { return GetPointer(VT_ANY_AMBIGUOUS); @@ -1595,7 +1595,7 @@ struct Monster FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { } bool Verify(flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && - VerifyField(verifier, VT_POS) && + VerifyField(verifier, VT_POS) && VerifyField(verifier, VT_MANA) && VerifyField(verifier, VT_HP) && VerifyOffsetRequired(verifier, VT_NAME) && @@ -1679,11 +1679,11 @@ struct Monster FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { static flatbuffers::Offset Pack(flatbuffers::FlatBufferBuilder &_fbb, const MonsterT* _o, const flatbuffers::rehasher_function_t *_rehasher = nullptr); }; -template<> inline const Monster *Monster::test_as() const { +template<> inline const MyGame::Example::Monster *Monster::test_as() const { return test_as_Monster(); } -template<> inline const TestSimpleTableWithEnum *Monster::test_as() const { +template<> inline const MyGame::Example::TestSimpleTableWithEnum *Monster::test_as() const { return test_as_TestSimpleTableWithEnum(); } @@ -1691,11 +1691,11 @@ template<> inline const MyGame::Example2::Monster *Monster::test_as inline const Monster *Monster::any_unique_as() const { +template<> inline const MyGame::Example::Monster *Monster::any_unique_as() const { return any_unique_as_M(); } -template<> inline const TestSimpleTableWithEnum *Monster::any_unique_as() const { +template<> inline const MyGame::Example::TestSimpleTableWithEnum *Monster::any_unique_as() const { return any_unique_as_TS(); } @@ -1706,7 +1706,7 @@ template<> inline const MyGame::Example2::Monster *Monster::any_unique_as> inventory) { fbb_.AddOffset(Monster::VT_INVENTORY, inventory); } - void add_color(Color color) { + void add_color(MyGame::Example::Color color) { fbb_.AddElement(Monster::VT_COLOR, static_cast(color), 8); } - void add_test_type(Any test_type) { + void add_test_type(MyGame::Example::Any test_type) { fbb_.AddElement(Monster::VT_TEST_TYPE, static_cast(test_type), 0); } void add_test(flatbuffers::Offset test) { fbb_.AddOffset(Monster::VT_TEST, test); } - void add_test4(flatbuffers::Offset> test4) { + void add_test4(flatbuffers::Offset> test4) { fbb_.AddOffset(Monster::VT_TEST4, test4); } void add_testarrayofstring(flatbuffers::Offset>> testarrayofstring) { fbb_.AddOffset(Monster::VT_TESTARRAYOFSTRING, testarrayofstring); } - void add_testarrayoftables(flatbuffers::Offset>> testarrayoftables) { + void add_testarrayoftables(flatbuffers::Offset>> testarrayoftables) { fbb_.AddOffset(Monster::VT_TESTARRAYOFTABLES, testarrayoftables); } - void add_enemy(flatbuffers::Offset enemy) { + void add_enemy(flatbuffers::Offset enemy) { fbb_.AddOffset(Monster::VT_ENEMY, enemy); } void add_testnestedflatbuffer(flatbuffers::Offset> testnestedflatbuffer) { fbb_.AddOffset(Monster::VT_TESTNESTEDFLATBUFFER, testnestedflatbuffer); } - void add_testempty(flatbuffers::Offset testempty) { + void add_testempty(flatbuffers::Offset testempty) { fbb_.AddOffset(Monster::VT_TESTEMPTY, testempty); } void add_testbool(bool testbool) { @@ -1790,13 +1790,13 @@ struct MonsterBuilder { void add_testarrayofstring2(flatbuffers::Offset>> testarrayofstring2) { fbb_.AddOffset(Monster::VT_TESTARRAYOFSTRING2, testarrayofstring2); } - void add_testarrayofsortedstruct(flatbuffers::Offset> testarrayofsortedstruct) { + void add_testarrayofsortedstruct(flatbuffers::Offset> testarrayofsortedstruct) { fbb_.AddOffset(Monster::VT_TESTARRAYOFSORTEDSTRUCT, testarrayofsortedstruct); } void add_flex(flatbuffers::Offset> flex) { fbb_.AddOffset(Monster::VT_FLEX, flex); } - void add_test5(flatbuffers::Offset> test5) { + void add_test5(flatbuffers::Offset> test5) { fbb_.AddOffset(Monster::VT_TEST5, test5); } void add_vector_of_longs(flatbuffers::Offset> vector_of_longs) { @@ -1808,7 +1808,7 @@ struct MonsterBuilder { void add_parent_namespace_test(flatbuffers::Offset parent_namespace_test) { fbb_.AddOffset(Monster::VT_PARENT_NAMESPACE_TEST, parent_namespace_test); } - void add_vector_of_referrables(flatbuffers::Offset>> vector_of_referrables) { + void add_vector_of_referrables(flatbuffers::Offset>> vector_of_referrables) { fbb_.AddOffset(Monster::VT_VECTOR_OF_REFERRABLES, vector_of_referrables); } void add_single_weak_reference(uint64_t single_weak_reference) { @@ -1817,7 +1817,7 @@ struct MonsterBuilder { void add_vector_of_weak_references(flatbuffers::Offset> vector_of_weak_references) { fbb_.AddOffset(Monster::VT_VECTOR_OF_WEAK_REFERENCES, vector_of_weak_references); } - void add_vector_of_strong_referrables(flatbuffers::Offset>> vector_of_strong_referrables) { + void add_vector_of_strong_referrables(flatbuffers::Offset>> vector_of_strong_referrables) { fbb_.AddOffset(Monster::VT_VECTOR_OF_STRONG_REFERRABLES, vector_of_strong_referrables); } void add_co_owning_reference(uint64_t co_owning_reference) { @@ -1832,13 +1832,13 @@ struct MonsterBuilder { void add_vector_of_non_owning_references(flatbuffers::Offset> vector_of_non_owning_references) { fbb_.AddOffset(Monster::VT_VECTOR_OF_NON_OWNING_REFERENCES, vector_of_non_owning_references); } - void add_any_unique_type(AnyUniqueAliases any_unique_type) { + void add_any_unique_type(MyGame::Example::AnyUniqueAliases any_unique_type) { fbb_.AddElement(Monster::VT_ANY_UNIQUE_TYPE, static_cast(any_unique_type), 0); } void add_any_unique(flatbuffers::Offset any_unique) { fbb_.AddOffset(Monster::VT_ANY_UNIQUE, any_unique); } - void add_any_ambiguous_type(AnyAmbiguousAliases any_ambiguous_type) { + void add_any_ambiguous_type(MyGame::Example::AnyAmbiguousAliases any_ambiguous_type) { fbb_.AddElement(Monster::VT_ANY_AMBIGUOUS_TYPE, static_cast(any_ambiguous_type), 0); } void add_any_ambiguous(flatbuffers::Offset any_ambiguous) { @@ -1862,20 +1862,20 @@ struct MonsterBuilder { inline flatbuffers::Offset CreateMonster( flatbuffers::FlatBufferBuilder &_fbb, - const Vec3 *pos = 0, + const MyGame::Example::Vec3 *pos = 0, int16_t mana = 150, int16_t hp = 100, flatbuffers::Offset name = 0, flatbuffers::Offset> inventory = 0, - Color color = Color_Blue, - Any test_type = Any_NONE, + MyGame::Example::Color color = MyGame::Example::Color_Blue, + MyGame::Example::Any test_type = MyGame::Example::Any_NONE, flatbuffers::Offset test = 0, - flatbuffers::Offset> test4 = 0, + flatbuffers::Offset> test4 = 0, flatbuffers::Offset>> testarrayofstring = 0, - flatbuffers::Offset>> testarrayoftables = 0, - flatbuffers::Offset enemy = 0, + flatbuffers::Offset>> testarrayoftables = 0, + flatbuffers::Offset enemy = 0, flatbuffers::Offset> testnestedflatbuffer = 0, - flatbuffers::Offset testempty = 0, + flatbuffers::Offset testempty = 0, bool testbool = false, int32_t testhashs32_fnv1 = 0, uint32_t testhashu32_fnv1 = 0, @@ -1890,23 +1890,23 @@ inline flatbuffers::Offset CreateMonster( float testf2 = 3.0f, float testf3 = 0.0f, flatbuffers::Offset>> testarrayofstring2 = 0, - flatbuffers::Offset> testarrayofsortedstruct = 0, + flatbuffers::Offset> testarrayofsortedstruct = 0, flatbuffers::Offset> flex = 0, - flatbuffers::Offset> test5 = 0, + flatbuffers::Offset> test5 = 0, flatbuffers::Offset> vector_of_longs = 0, flatbuffers::Offset> vector_of_doubles = 0, flatbuffers::Offset parent_namespace_test = 0, - flatbuffers::Offset>> vector_of_referrables = 0, + flatbuffers::Offset>> vector_of_referrables = 0, uint64_t single_weak_reference = 0, flatbuffers::Offset> vector_of_weak_references = 0, - flatbuffers::Offset>> vector_of_strong_referrables = 0, + flatbuffers::Offset>> vector_of_strong_referrables = 0, uint64_t co_owning_reference = 0, flatbuffers::Offset> vector_of_co_owning_references = 0, uint64_t non_owning_reference = 0, flatbuffers::Offset> vector_of_non_owning_references = 0, - AnyUniqueAliases any_unique_type = AnyUniqueAliases_NONE, + MyGame::Example::AnyUniqueAliases any_unique_type = MyGame::Example::AnyUniqueAliases_NONE, flatbuffers::Offset any_unique = 0, - AnyAmbiguousAliases any_ambiguous_type = AnyAmbiguousAliases_NONE, + MyGame::Example::AnyAmbiguousAliases any_ambiguous_type = MyGame::Example::AnyAmbiguousAliases_NONE, flatbuffers::Offset any_ambiguous = 0, flatbuffers::Offset> vector_of_enums = 0) { MonsterBuilder builder_(_fbb); @@ -1962,20 +1962,20 @@ inline flatbuffers::Offset CreateMonster( inline flatbuffers::Offset CreateMonsterDirect( flatbuffers::FlatBufferBuilder &_fbb, - const Vec3 *pos = 0, + const MyGame::Example::Vec3 *pos = 0, int16_t mana = 150, int16_t hp = 100, const char *name = nullptr, const std::vector *inventory = nullptr, - Color color = Color_Blue, - Any test_type = Any_NONE, + MyGame::Example::Color color = MyGame::Example::Color_Blue, + MyGame::Example::Any test_type = MyGame::Example::Any_NONE, flatbuffers::Offset test = 0, - const std::vector *test4 = nullptr, + const std::vector *test4 = nullptr, const std::vector> *testarrayofstring = nullptr, - const std::vector> *testarrayoftables = nullptr, - flatbuffers::Offset enemy = 0, + const std::vector> *testarrayoftables = nullptr, + flatbuffers::Offset enemy = 0, const std::vector *testnestedflatbuffer = nullptr, - flatbuffers::Offset testempty = 0, + flatbuffers::Offset testempty = 0, bool testbool = false, int32_t testhashs32_fnv1 = 0, uint32_t testhashu32_fnv1 = 0, @@ -1990,41 +1990,41 @@ inline flatbuffers::Offset CreateMonsterDirect( float testf2 = 3.0f, float testf3 = 0.0f, const std::vector> *testarrayofstring2 = nullptr, - const std::vector *testarrayofsortedstruct = nullptr, + const std::vector *testarrayofsortedstruct = nullptr, const std::vector *flex = nullptr, - const std::vector *test5 = nullptr, + const std::vector *test5 = nullptr, const std::vector *vector_of_longs = nullptr, const std::vector *vector_of_doubles = nullptr, flatbuffers::Offset parent_namespace_test = 0, - const std::vector> *vector_of_referrables = nullptr, + const std::vector> *vector_of_referrables = nullptr, uint64_t single_weak_reference = 0, const std::vector *vector_of_weak_references = nullptr, - const std::vector> *vector_of_strong_referrables = nullptr, + const std::vector> *vector_of_strong_referrables = nullptr, uint64_t co_owning_reference = 0, const std::vector *vector_of_co_owning_references = nullptr, uint64_t non_owning_reference = 0, const std::vector *vector_of_non_owning_references = nullptr, - AnyUniqueAliases any_unique_type = AnyUniqueAliases_NONE, + MyGame::Example::AnyUniqueAliases any_unique_type = MyGame::Example::AnyUniqueAliases_NONE, flatbuffers::Offset any_unique = 0, - AnyAmbiguousAliases any_ambiguous_type = AnyAmbiguousAliases_NONE, + MyGame::Example::AnyAmbiguousAliases any_ambiguous_type = MyGame::Example::AnyAmbiguousAliases_NONE, flatbuffers::Offset any_ambiguous = 0, const std::vector *vector_of_enums = nullptr) { auto name__ = name ? _fbb.CreateString(name) : 0; auto inventory__ = inventory ? _fbb.CreateVector(*inventory) : 0; - auto test4__ = test4 ? _fbb.CreateVectorOfStructs(*test4) : 0; + auto test4__ = test4 ? _fbb.CreateVectorOfStructs(*test4) : 0; auto testarrayofstring__ = testarrayofstring ? _fbb.CreateVector>(*testarrayofstring) : 0; - auto testarrayoftables__ = testarrayoftables ? _fbb.CreateVector>(*testarrayoftables) : 0; + auto testarrayoftables__ = testarrayoftables ? _fbb.CreateVector>(*testarrayoftables) : 0; auto testnestedflatbuffer__ = testnestedflatbuffer ? _fbb.CreateVector(*testnestedflatbuffer) : 0; auto testarrayofbools__ = testarrayofbools ? _fbb.CreateVector(*testarrayofbools) : 0; auto testarrayofstring2__ = testarrayofstring2 ? _fbb.CreateVector>(*testarrayofstring2) : 0; - auto testarrayofsortedstruct__ = testarrayofsortedstruct ? _fbb.CreateVectorOfStructs(*testarrayofsortedstruct) : 0; + auto testarrayofsortedstruct__ = testarrayofsortedstruct ? _fbb.CreateVectorOfStructs(*testarrayofsortedstruct) : 0; auto flex__ = flex ? _fbb.CreateVector(*flex) : 0; - auto test5__ = test5 ? _fbb.CreateVectorOfStructs(*test5) : 0; + auto test5__ = test5 ? _fbb.CreateVectorOfStructs(*test5) : 0; auto vector_of_longs__ = vector_of_longs ? _fbb.CreateVector(*vector_of_longs) : 0; auto vector_of_doubles__ = vector_of_doubles ? _fbb.CreateVector(*vector_of_doubles) : 0; - auto vector_of_referrables__ = vector_of_referrables ? _fbb.CreateVector>(*vector_of_referrables) : 0; + auto vector_of_referrables__ = vector_of_referrables ? _fbb.CreateVector>(*vector_of_referrables) : 0; auto vector_of_weak_references__ = vector_of_weak_references ? _fbb.CreateVector(*vector_of_weak_references) : 0; - auto vector_of_strong_referrables__ = vector_of_strong_referrables ? _fbb.CreateVector>(*vector_of_strong_referrables) : 0; + auto vector_of_strong_referrables__ = vector_of_strong_referrables ? _fbb.CreateVector>(*vector_of_strong_referrables) : 0; auto vector_of_co_owning_references__ = vector_of_co_owning_references ? _fbb.CreateVector(*vector_of_co_owning_references) : 0; auto vector_of_non_owning_references__ = vector_of_non_owning_references ? _fbb.CreateVector(*vector_of_non_owning_references) : 0; auto vector_of_enums__ = vector_of_enums ? _fbb.CreateVector(*vector_of_enums) : 0; @@ -2506,7 +2506,7 @@ inline MonsterT *Monster::UnPack(const flatbuffers::resolver_function_t *_resolv inline void Monster::UnPackTo(MonsterT *_o, const flatbuffers::resolver_function_t *_resolver) const { (void)_o; (void)_resolver; - { auto _e = pos(); if (_e) _o->pos = flatbuffers::unique_ptr(new Vec3(*_e)); }; + { auto _e = pos(); if (_e) _o->pos = flatbuffers::unique_ptr(new MyGame::Example::Vec3(*_e)); }; { auto _e = mana(); _o->mana = _e; }; { auto _e = hp(); _o->hp = _e; }; { auto _e = name(); if (_e) _o->name = _e->str(); }; @@ -2516,10 +2516,10 @@ inline void Monster::UnPackTo(MonsterT *_o, const flatbuffers::resolver_function { auto _e = test(); if (_e) _o->test.value = AnyUnion::UnPack(_e, test_type(), _resolver); }; { auto _e = test4(); if (_e) { _o->test4.resize(_e->size()); for (flatbuffers::uoffset_t _i = 0; _i < _e->size(); _i++) { _o->test4[_i] = *_e->Get(_i); } } }; { auto _e = testarrayofstring(); if (_e) { _o->testarrayofstring.resize(_e->size()); for (flatbuffers::uoffset_t _i = 0; _i < _e->size(); _i++) { _o->testarrayofstring[_i] = _e->Get(_i)->str(); } } }; - { auto _e = testarrayoftables(); if (_e) { _o->testarrayoftables.resize(_e->size()); for (flatbuffers::uoffset_t _i = 0; _i < _e->size(); _i++) { _o->testarrayoftables[_i] = flatbuffers::unique_ptr(_e->Get(_i)->UnPack(_resolver)); } } }; - { auto _e = enemy(); if (_e) _o->enemy = flatbuffers::unique_ptr(_e->UnPack(_resolver)); }; + { auto _e = testarrayoftables(); if (_e) { _o->testarrayoftables.resize(_e->size()); for (flatbuffers::uoffset_t _i = 0; _i < _e->size(); _i++) { _o->testarrayoftables[_i] = flatbuffers::unique_ptr(_e->Get(_i)->UnPack(_resolver)); } } }; + { auto _e = enemy(); if (_e) _o->enemy = flatbuffers::unique_ptr(_e->UnPack(_resolver)); }; { auto _e = testnestedflatbuffer(); if (_e) { _o->testnestedflatbuffer.resize(_e->size()); for (flatbuffers::uoffset_t _i = 0; _i < _e->size(); _i++) { _o->testnestedflatbuffer[_i] = _e->Get(_i); } } }; - { auto _e = testempty(); if (_e) _o->testempty = flatbuffers::unique_ptr(_e->UnPack(_resolver)); }; + { auto _e = testempty(); if (_e) _o->testempty = flatbuffers::unique_ptr(_e->UnPack(_resolver)); }; { auto _e = testbool(); _o->testbool = _e; }; { auto _e = testhashs32_fnv1(); _o->testhashs32_fnv1 = _e; }; { auto _e = testhashu32_fnv1(); _o->testhashu32_fnv1 = _e; }; @@ -2541,12 +2541,12 @@ if (_resolver) (*_resolver)(reinterpret_cast(&_o->testhashu32_fnv1a), s { auto _e = vector_of_longs(); if (_e) { _o->vector_of_longs.resize(_e->size()); for (flatbuffers::uoffset_t _i = 0; _i < _e->size(); _i++) { _o->vector_of_longs[_i] = _e->Get(_i); } } }; { auto _e = vector_of_doubles(); if (_e) { _o->vector_of_doubles.resize(_e->size()); for (flatbuffers::uoffset_t _i = 0; _i < _e->size(); _i++) { _o->vector_of_doubles[_i] = _e->Get(_i); } } }; { auto _e = parent_namespace_test(); if (_e) _o->parent_namespace_test = flatbuffers::unique_ptr(_e->UnPack(_resolver)); }; - { auto _e = vector_of_referrables(); if (_e) { _o->vector_of_referrables.resize(_e->size()); for (flatbuffers::uoffset_t _i = 0; _i < _e->size(); _i++) { _o->vector_of_referrables[_i] = flatbuffers::unique_ptr(_e->Get(_i)->UnPack(_resolver)); } } }; + { auto _e = vector_of_referrables(); if (_e) { _o->vector_of_referrables.resize(_e->size()); for (flatbuffers::uoffset_t _i = 0; _i < _e->size(); _i++) { _o->vector_of_referrables[_i] = flatbuffers::unique_ptr(_e->Get(_i)->UnPack(_resolver)); } } }; { auto _e = single_weak_reference(); //scalar resolver, naked if (_resolver) (*_resolver)(reinterpret_cast(&_o->single_weak_reference), static_cast(_e)); else _o->single_weak_reference = nullptr; }; { auto _e = vector_of_weak_references(); if (_e) { _o->vector_of_weak_references.resize(_e->size()); for (flatbuffers::uoffset_t _i = 0; _i < _e->size(); _i++) { //vector resolver, naked if (_resolver) (*_resolver)(reinterpret_cast(&_o->vector_of_weak_references[_i]), static_cast(_e->Get(_i))); else _o->vector_of_weak_references[_i] = nullptr; } } }; - { auto _e = vector_of_strong_referrables(); if (_e) { _o->vector_of_strong_referrables.resize(_e->size()); for (flatbuffers::uoffset_t _i = 0; _i < _e->size(); _i++) { _o->vector_of_strong_referrables[_i] = flatbuffers::unique_ptr(_e->Get(_i)->UnPack(_resolver)); } } }; + { auto _e = vector_of_strong_referrables(); if (_e) { _o->vector_of_strong_referrables.resize(_e->size()); for (flatbuffers::uoffset_t _i = 0; _i < _e->size(); _i++) { _o->vector_of_strong_referrables[_i] = flatbuffers::unique_ptr(_e->Get(_i)->UnPack(_resolver)); } } }; { auto _e = co_owning_reference(); //scalar resolver, naked if (_resolver) (*_resolver)(reinterpret_cast(&_o->co_owning_reference), static_cast(_e)); else _o->co_owning_reference = nullptr; }; { auto _e = vector_of_co_owning_references(); if (_e) { _o->vector_of_co_owning_references.resize(_e->size()); for (flatbuffers::uoffset_t _i = 0; _i < _e->size(); _i++) { //vector resolver, default_ptr_type @@ -2559,7 +2559,7 @@ if (_resolver) (*_resolver)(reinterpret_cast(&_o->vector_of_non_owning_ { auto _e = any_unique(); if (_e) _o->any_unique.value = AnyUniqueAliasesUnion::UnPack(_e, any_unique_type(), _resolver); }; { auto _e = any_ambiguous_type(); _o->any_ambiguous.type = _e; }; { auto _e = any_ambiguous(); if (_e) _o->any_ambiguous.value = AnyAmbiguousAliasesUnion::UnPack(_e, any_ambiguous_type(), _resolver); }; - { auto _e = vector_of_enums(); if (_e) { _o->vector_of_enums.resize(_e->size()); for (flatbuffers::uoffset_t _i = 0; _i < _e->size(); _i++) { _o->vector_of_enums[_i] = static_cast(_e->Get(_i)); } } }; + { auto _e = vector_of_enums(); if (_e) { _o->vector_of_enums.resize(_e->size()); for (flatbuffers::uoffset_t _i = 0; _i < _e->size(); _i++) { _o->vector_of_enums[_i] = static_cast(_e->Get(_i)); } } }; } inline flatbuffers::Offset Monster::Pack(flatbuffers::FlatBufferBuilder &_fbb, const MonsterT* _o, const flatbuffers::rehasher_function_t *_rehasher) { @@ -2580,7 +2580,7 @@ inline flatbuffers::Offset CreateMonster(flatbuffers::FlatBufferBuilder auto _test = _o->test.Pack(_fbb); auto _test4 = _o->test4.size() ? _fbb.CreateVectorOfStructs(_o->test4) : 0; auto _testarrayofstring = _o->testarrayofstring.size() ? _fbb.CreateVectorOfStrings(_o->testarrayofstring) : 0; - auto _testarrayoftables = _o->testarrayoftables.size() ? _fbb.CreateVector> (_o->testarrayoftables.size(), [](size_t i, _VectorArgs *__va) { return CreateMonster(*__va->__fbb, __va->__o->testarrayoftables[i].get(), __va->__rehasher); }, &_va ) : 0; + auto _testarrayoftables = _o->testarrayoftables.size() ? _fbb.CreateVector> (_o->testarrayoftables.size(), [](size_t i, _VectorArgs *__va) { return CreateMonster(*__va->__fbb, __va->__o->testarrayoftables[i].get(), __va->__rehasher); }, &_va ) : 0; auto _enemy = _o->enemy ? CreateMonster(_fbb, _o->enemy.get(), _rehasher) : 0; auto _testnestedflatbuffer = _o->testnestedflatbuffer.size() ? _fbb.CreateVector(_o->testnestedflatbuffer) : 0; auto _testempty = _o->testempty ? CreateStat(_fbb, _o->testempty.get(), _rehasher) : 0; @@ -2604,10 +2604,10 @@ inline flatbuffers::Offset CreateMonster(flatbuffers::FlatBufferBuilder auto _vector_of_longs = _o->vector_of_longs.size() ? _fbb.CreateVector(_o->vector_of_longs) : 0; auto _vector_of_doubles = _o->vector_of_doubles.size() ? _fbb.CreateVector(_o->vector_of_doubles) : 0; auto _parent_namespace_test = _o->parent_namespace_test ? CreateInParentNamespace(_fbb, _o->parent_namespace_test.get(), _rehasher) : 0; - auto _vector_of_referrables = _o->vector_of_referrables.size() ? _fbb.CreateVector> (_o->vector_of_referrables.size(), [](size_t i, _VectorArgs *__va) { return CreateReferrable(*__va->__fbb, __va->__o->vector_of_referrables[i].get(), __va->__rehasher); }, &_va ) : 0; + auto _vector_of_referrables = _o->vector_of_referrables.size() ? _fbb.CreateVector> (_o->vector_of_referrables.size(), [](size_t i, _VectorArgs *__va) { return CreateReferrable(*__va->__fbb, __va->__o->vector_of_referrables[i].get(), __va->__rehasher); }, &_va ) : 0; auto _single_weak_reference = _rehasher ? static_cast((*_rehasher)(_o->single_weak_reference)) : 0; auto _vector_of_weak_references = _o->vector_of_weak_references.size() ? _fbb.CreateVector(_o->vector_of_weak_references.size(), [](size_t i, _VectorArgs *__va) { return __va->__rehasher ? static_cast((*__va->__rehasher)(__va->__o->vector_of_weak_references[i])) : 0; }, &_va ) : 0; - auto _vector_of_strong_referrables = _o->vector_of_strong_referrables.size() ? _fbb.CreateVector> (_o->vector_of_strong_referrables.size(), [](size_t i, _VectorArgs *__va) { return CreateReferrable(*__va->__fbb, __va->__o->vector_of_strong_referrables[i].get(), __va->__rehasher); }, &_va ) : 0; + auto _vector_of_strong_referrables = _o->vector_of_strong_referrables.size() ? _fbb.CreateVector> (_o->vector_of_strong_referrables.size(), [](size_t i, _VectorArgs *__va) { return CreateReferrable(*__va->__fbb, __va->__o->vector_of_strong_referrables[i].get(), __va->__rehasher); }, &_va ) : 0; auto _co_owning_reference = _rehasher ? static_cast((*_rehasher)(_o->co_owning_reference)) : 0; auto _vector_of_co_owning_references = _o->vector_of_co_owning_references.size() ? _fbb.CreateVector(_o->vector_of_co_owning_references.size(), [](size_t i, _VectorArgs *__va) { return __va->__rehasher ? static_cast((*__va->__rehasher)(__va->__o->vector_of_co_owning_references[i].get())) : 0; }, &_va ) : 0; auto _non_owning_reference = _rehasher ? static_cast((*_rehasher)(_o->non_owning_reference)) : 0; @@ -2733,11 +2733,11 @@ inline bool VerifyAny(flatbuffers::Verifier &verifier, const void *obj, Any type return true; } case Any_Monster: { - auto ptr = reinterpret_cast(obj); + auto ptr = reinterpret_cast(obj); return verifier.VerifyTable(ptr); } case Any_TestSimpleTableWithEnum: { - auto ptr = reinterpret_cast(obj); + auto ptr = reinterpret_cast(obj); return verifier.VerifyTable(ptr); } case Any_MyGame_Example2_Monster: { @@ -2763,11 +2763,11 @@ inline bool VerifyAnyVector(flatbuffers::Verifier &verifier, const flatbuffers:: inline void *AnyUnion::UnPack(const void *obj, Any type, const flatbuffers::resolver_function_t *resolver) { switch (type) { case Any_Monster: { - auto ptr = reinterpret_cast(obj); + auto ptr = reinterpret_cast(obj); return ptr->UnPack(resolver); } case Any_TestSimpleTableWithEnum: { - auto ptr = reinterpret_cast(obj); + auto ptr = reinterpret_cast(obj); return ptr->UnPack(resolver); } case Any_MyGame_Example2_Monster: { @@ -2781,11 +2781,11 @@ inline void *AnyUnion::UnPack(const void *obj, Any type, const flatbuffers::reso inline flatbuffers::Offset AnyUnion::Pack(flatbuffers::FlatBufferBuilder &_fbb, const flatbuffers::rehasher_function_t *_rehasher) const { switch (type) { case Any_Monster: { - auto ptr = reinterpret_cast(value); + auto ptr = reinterpret_cast(value); return CreateMonster(_fbb, ptr, _rehasher).Union(); } case Any_TestSimpleTableWithEnum: { - auto ptr = reinterpret_cast(value); + auto ptr = reinterpret_cast(value); return CreateTestSimpleTableWithEnum(_fbb, ptr, _rehasher).Union(); } case Any_MyGame_Example2_Monster: { @@ -2799,11 +2799,11 @@ inline flatbuffers::Offset AnyUnion::Pack(flatbuffers::FlatBufferBuilder & inline AnyUnion::AnyUnion(const AnyUnion &u) FLATBUFFERS_NOEXCEPT : type(u.type), value(nullptr) { switch (type) { case Any_Monster: { - FLATBUFFERS_ASSERT(false); // MonsterT not copyable. + FLATBUFFERS_ASSERT(false); // MyGame::Example::MonsterT not copyable. break; } case Any_TestSimpleTableWithEnum: { - value = new TestSimpleTableWithEnumT(*reinterpret_cast(u.value)); + value = new MyGame::Example::TestSimpleTableWithEnumT(*reinterpret_cast(u.value)); break; } case Any_MyGame_Example2_Monster: { @@ -2818,12 +2818,12 @@ inline AnyUnion::AnyUnion(const AnyUnion &u) FLATBUFFERS_NOEXCEPT : type(u.type) inline void AnyUnion::Reset() { switch (type) { case Any_Monster: { - auto ptr = reinterpret_cast(value); + auto ptr = reinterpret_cast(value); delete ptr; break; } case Any_TestSimpleTableWithEnum: { - auto ptr = reinterpret_cast(value); + auto ptr = reinterpret_cast(value); delete ptr; break; } @@ -2844,11 +2844,11 @@ inline bool VerifyAnyUniqueAliases(flatbuffers::Verifier &verifier, const void * return true; } case AnyUniqueAliases_M: { - auto ptr = reinterpret_cast(obj); + auto ptr = reinterpret_cast(obj); return verifier.VerifyTable(ptr); } case AnyUniqueAliases_TS: { - auto ptr = reinterpret_cast(obj); + auto ptr = reinterpret_cast(obj); return verifier.VerifyTable(ptr); } case AnyUniqueAliases_M2: { @@ -2874,11 +2874,11 @@ inline bool VerifyAnyUniqueAliasesVector(flatbuffers::Verifier &verifier, const inline void *AnyUniqueAliasesUnion::UnPack(const void *obj, AnyUniqueAliases type, const flatbuffers::resolver_function_t *resolver) { switch (type) { case AnyUniqueAliases_M: { - auto ptr = reinterpret_cast(obj); + auto ptr = reinterpret_cast(obj); return ptr->UnPack(resolver); } case AnyUniqueAliases_TS: { - auto ptr = reinterpret_cast(obj); + auto ptr = reinterpret_cast(obj); return ptr->UnPack(resolver); } case AnyUniqueAliases_M2: { @@ -2892,11 +2892,11 @@ inline void *AnyUniqueAliasesUnion::UnPack(const void *obj, AnyUniqueAliases typ inline flatbuffers::Offset AnyUniqueAliasesUnion::Pack(flatbuffers::FlatBufferBuilder &_fbb, const flatbuffers::rehasher_function_t *_rehasher) const { switch (type) { case AnyUniqueAliases_M: { - auto ptr = reinterpret_cast(value); + auto ptr = reinterpret_cast(value); return CreateMonster(_fbb, ptr, _rehasher).Union(); } case AnyUniqueAliases_TS: { - auto ptr = reinterpret_cast(value); + auto ptr = reinterpret_cast(value); return CreateTestSimpleTableWithEnum(_fbb, ptr, _rehasher).Union(); } case AnyUniqueAliases_M2: { @@ -2910,11 +2910,11 @@ inline flatbuffers::Offset AnyUniqueAliasesUnion::Pack(flatbuffers::FlatBu inline AnyUniqueAliasesUnion::AnyUniqueAliasesUnion(const AnyUniqueAliasesUnion &u) FLATBUFFERS_NOEXCEPT : type(u.type), value(nullptr) { switch (type) { case AnyUniqueAliases_M: { - FLATBUFFERS_ASSERT(false); // MonsterT not copyable. + FLATBUFFERS_ASSERT(false); // MyGame::Example::MonsterT not copyable. break; } case AnyUniqueAliases_TS: { - value = new TestSimpleTableWithEnumT(*reinterpret_cast(u.value)); + value = new MyGame::Example::TestSimpleTableWithEnumT(*reinterpret_cast(u.value)); break; } case AnyUniqueAliases_M2: { @@ -2929,12 +2929,12 @@ inline AnyUniqueAliasesUnion::AnyUniqueAliasesUnion(const AnyUniqueAliasesUnion inline void AnyUniqueAliasesUnion::Reset() { switch (type) { case AnyUniqueAliases_M: { - auto ptr = reinterpret_cast(value); + auto ptr = reinterpret_cast(value); delete ptr; break; } case AnyUniqueAliases_TS: { - auto ptr = reinterpret_cast(value); + auto ptr = reinterpret_cast(value); delete ptr; break; } @@ -2955,15 +2955,15 @@ inline bool VerifyAnyAmbiguousAliases(flatbuffers::Verifier &verifier, const voi return true; } case AnyAmbiguousAliases_M1: { - auto ptr = reinterpret_cast(obj); + auto ptr = reinterpret_cast(obj); return verifier.VerifyTable(ptr); } case AnyAmbiguousAliases_M2: { - auto ptr = reinterpret_cast(obj); + auto ptr = reinterpret_cast(obj); return verifier.VerifyTable(ptr); } case AnyAmbiguousAliases_M3: { - auto ptr = reinterpret_cast(obj); + auto ptr = reinterpret_cast(obj); return verifier.VerifyTable(ptr); } default: return false; @@ -2985,15 +2985,15 @@ inline bool VerifyAnyAmbiguousAliasesVector(flatbuffers::Verifier &verifier, con inline void *AnyAmbiguousAliasesUnion::UnPack(const void *obj, AnyAmbiguousAliases type, const flatbuffers::resolver_function_t *resolver) { switch (type) { case AnyAmbiguousAliases_M1: { - auto ptr = reinterpret_cast(obj); + auto ptr = reinterpret_cast(obj); return ptr->UnPack(resolver); } case AnyAmbiguousAliases_M2: { - auto ptr = reinterpret_cast(obj); + auto ptr = reinterpret_cast(obj); return ptr->UnPack(resolver); } case AnyAmbiguousAliases_M3: { - auto ptr = reinterpret_cast(obj); + auto ptr = reinterpret_cast(obj); return ptr->UnPack(resolver); } default: return nullptr; @@ -3003,15 +3003,15 @@ inline void *AnyAmbiguousAliasesUnion::UnPack(const void *obj, AnyAmbiguousAlias inline flatbuffers::Offset AnyAmbiguousAliasesUnion::Pack(flatbuffers::FlatBufferBuilder &_fbb, const flatbuffers::rehasher_function_t *_rehasher) const { switch (type) { case AnyAmbiguousAliases_M1: { - auto ptr = reinterpret_cast(value); + auto ptr = reinterpret_cast(value); return CreateMonster(_fbb, ptr, _rehasher).Union(); } case AnyAmbiguousAliases_M2: { - auto ptr = reinterpret_cast(value); + auto ptr = reinterpret_cast(value); return CreateMonster(_fbb, ptr, _rehasher).Union(); } case AnyAmbiguousAliases_M3: { - auto ptr = reinterpret_cast(value); + auto ptr = reinterpret_cast(value); return CreateMonster(_fbb, ptr, _rehasher).Union(); } default: return 0; @@ -3021,15 +3021,15 @@ inline flatbuffers::Offset AnyAmbiguousAliasesUnion::Pack(flatbuffers::Fla inline AnyAmbiguousAliasesUnion::AnyAmbiguousAliasesUnion(const AnyAmbiguousAliasesUnion &u) FLATBUFFERS_NOEXCEPT : type(u.type), value(nullptr) { switch (type) { case AnyAmbiguousAliases_M1: { - FLATBUFFERS_ASSERT(false); // MonsterT not copyable. + FLATBUFFERS_ASSERT(false); // MyGame::Example::MonsterT not copyable. break; } case AnyAmbiguousAliases_M2: { - FLATBUFFERS_ASSERT(false); // MonsterT not copyable. + FLATBUFFERS_ASSERT(false); // MyGame::Example::MonsterT not copyable. break; } case AnyAmbiguousAliases_M3: { - FLATBUFFERS_ASSERT(false); // MonsterT not copyable. + FLATBUFFERS_ASSERT(false); // MyGame::Example::MonsterT not copyable. break; } default: @@ -3040,17 +3040,17 @@ inline AnyAmbiguousAliasesUnion::AnyAmbiguousAliasesUnion(const AnyAmbiguousAlia inline void AnyAmbiguousAliasesUnion::Reset() { switch (type) { case AnyAmbiguousAliases_M1: { - auto ptr = reinterpret_cast(value); + auto ptr = reinterpret_cast(value); delete ptr; break; } case AnyAmbiguousAliases_M2: { - auto ptr = reinterpret_cast(value); + auto ptr = reinterpret_cast(value); delete ptr; break; } case AnyAmbiguousAliases_M3: { - auto ptr = reinterpret_cast(value); + auto ptr = reinterpret_cast(value); delete ptr; break; } @@ -3067,7 +3067,7 @@ inline const flatbuffers::TypeTable *ColorTypeTable() { { flatbuffers::ET_UCHAR, 0, 0 } }; static const flatbuffers::TypeFunction type_refs[] = { - ColorTypeTable + MyGame::Example::ColorTypeTable }; static const int64_t values[] = { 1, 2, 8 }; static const char * const names[] = { @@ -3089,8 +3089,8 @@ inline const flatbuffers::TypeTable *AnyTypeTable() { { flatbuffers::ET_SEQUENCE, 0, 2 } }; static const flatbuffers::TypeFunction type_refs[] = { - MonsterTypeTable, - TestSimpleTableWithEnumTypeTable, + MyGame::Example::MonsterTypeTable, + MyGame::Example::TestSimpleTableWithEnumTypeTable, MyGame::Example2::MonsterTypeTable }; static const char * const names[] = { @@ -3113,8 +3113,8 @@ inline const flatbuffers::TypeTable *AnyUniqueAliasesTypeTable() { { flatbuffers::ET_SEQUENCE, 0, 2 } }; static const flatbuffers::TypeFunction type_refs[] = { - MonsterTypeTable, - TestSimpleTableWithEnumTypeTable, + MyGame::Example::MonsterTypeTable, + MyGame::Example::TestSimpleTableWithEnumTypeTable, MyGame::Example2::MonsterTypeTable }; static const char * const names[] = { @@ -3137,7 +3137,7 @@ inline const flatbuffers::TypeTable *AnyAmbiguousAliasesTypeTable() { { flatbuffers::ET_SEQUENCE, 0, 0 } }; static const flatbuffers::TypeFunction type_refs[] = { - MonsterTypeTable + MyGame::Example::MonsterTypeTable }; static const char * const names[] = { "NONE", @@ -3194,7 +3194,7 @@ inline const flatbuffers::TypeTable *TestSimpleTableWithEnumTypeTable() { { flatbuffers::ET_UCHAR, 0, 0 } }; static const flatbuffers::TypeFunction type_refs[] = { - ColorTypeTable + MyGame::Example::ColorTypeTable }; static const char * const names[] = { "color" @@ -3215,8 +3215,8 @@ inline const flatbuffers::TypeTable *Vec3TypeTable() { { flatbuffers::ET_SEQUENCE, 0, 1 } }; static const flatbuffers::TypeFunction type_refs[] = { - ColorTypeTable, - TestTypeTable + MyGame::Example::ColorTypeTable, + MyGame::Example::TestTypeTable }; static const int64_t values[] = { 0, 4, 8, 16, 24, 26, 32 }; static const char * const names[] = { @@ -3331,17 +3331,17 @@ inline const flatbuffers::TypeTable *MonsterTypeTable() { { flatbuffers::ET_UCHAR, 1, 1 } }; static const flatbuffers::TypeFunction type_refs[] = { - Vec3TypeTable, - ColorTypeTable, - AnyTypeTable, - TestTypeTable, - MonsterTypeTable, - StatTypeTable, - AbilityTypeTable, + MyGame::Example::Vec3TypeTable, + MyGame::Example::ColorTypeTable, + MyGame::Example::AnyTypeTable, + MyGame::Example::TestTypeTable, + MyGame::Example::MonsterTypeTable, + MyGame::Example::StatTypeTable, + MyGame::Example::AbilityTypeTable, MyGame::InParentNamespaceTypeTable, - ReferrableTypeTable, - AnyUniqueAliasesTypeTable, - AnyAmbiguousAliasesTypeTable + MyGame::Example::ReferrableTypeTable, + MyGame::Example::AnyUniqueAliasesTypeTable, + MyGame::Example::AnyAmbiguousAliasesTypeTable }; static const char * const names[] = { "pos", @@ -3481,16 +3481,16 @@ inline void FinishSizePrefixedMonsterBuffer( fbb.FinishSizePrefixed(root, MonsterIdentifier()); } -inline flatbuffers::unique_ptr UnPackMonster( +inline flatbuffers::unique_ptr UnPackMonster( const void *buf, const flatbuffers::resolver_function_t *res = nullptr) { - return flatbuffers::unique_ptr(GetMonster(buf)->UnPack(res)); + return flatbuffers::unique_ptr(GetMonster(buf)->UnPack(res)); } -inline flatbuffers::unique_ptr UnPackSizePrefixedMonster( +inline flatbuffers::unique_ptr UnPackSizePrefixedMonster( const void *buf, const flatbuffers::resolver_function_t *res = nullptr) { - return flatbuffers::unique_ptr(GetSizePrefixedMonster(buf)->UnPack(res)); + return flatbuffers::unique_ptr(GetSizePrefixedMonster(buf)->UnPack(res)); } } // namespace Example diff --git a/tests/namespace_test/NamespaceA/NamespaceB/StructInNestedNS.cs b/tests/namespace_test/NamespaceA/NamespaceB/StructInNestedNS.cs index 397fb89f5..08aaf28ca 100644 --- a/tests/namespace_test/NamespaceA/NamespaceB/StructInNestedNS.cs +++ b/tests/namespace_test/NamespaceA/NamespaceB/StructInNestedNS.cs @@ -20,11 +20,11 @@ public struct StructInNestedNS : IFlatbufferObject public int B { get { return __p.bb.GetInt(__p.bb_pos + 4); } } public void MutateB(int b) { __p.bb.PutInt(__p.bb_pos + 4, b); } - public static Offset CreateStructInNestedNS(FlatBufferBuilder builder, int A, int B) { + public static Offset CreateStructInNestedNS(FlatBufferBuilder builder, int A, int B) { builder.Prep(4, 8); builder.PutInt(B); builder.PutInt(A); - return new Offset(builder.Offset); + return new Offset(builder.Offset); } }; diff --git a/tests/namespace_test/NamespaceA/NamespaceB/TableInNestedNS.cs b/tests/namespace_test/NamespaceA/NamespaceB/TableInNestedNS.cs index b6a64cecb..2304f4d00 100644 --- a/tests/namespace_test/NamespaceA/NamespaceB/TableInNestedNS.cs +++ b/tests/namespace_test/NamespaceA/NamespaceB/TableInNestedNS.cs @@ -20,7 +20,7 @@ public struct TableInNestedNS : IFlatbufferObject public int Foo { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } public bool MutateFoo(int foo) { int o = __p.__offset(4); if (o != 0) { __p.bb.PutInt(o + __p.bb_pos, foo); return true; } else { return false; } } - public static Offset CreateTableInNestedNS(FlatBufferBuilder builder, + public static Offset CreateTableInNestedNS(FlatBufferBuilder builder, int foo = 0) { builder.StartTable(1); TableInNestedNS.AddFoo(builder, foo); @@ -29,9 +29,9 @@ public struct TableInNestedNS : IFlatbufferObject public static void StartTableInNestedNS(FlatBufferBuilder builder) { builder.StartTable(1); } public static void AddFoo(FlatBufferBuilder builder, int foo) { builder.AddInt(0, foo, 0); } - public static Offset EndTableInNestedNS(FlatBufferBuilder builder) { + public static Offset EndTableInNestedNS(FlatBufferBuilder builder) { int o = builder.EndTable(); - return new Offset(o); + return new Offset(o); } }; diff --git a/tests/namespace_test/NamespaceA/SecondTableInA.cs b/tests/namespace_test/NamespaceA/SecondTableInA.cs index 059b0a173..27fe09527 100644 --- a/tests/namespace_test/NamespaceA/SecondTableInA.cs +++ b/tests/namespace_test/NamespaceA/SecondTableInA.cs @@ -19,7 +19,7 @@ public struct SecondTableInA : IFlatbufferObject public NamespaceC.TableInC? ReferToC { get { int o = __p.__offset(4); return o != 0 ? (NamespaceC.TableInC?)(new NamespaceC.TableInC()).__assign(__p.__indirect(o + __p.bb_pos), __p.bb) : null; } } - public static Offset CreateSecondTableInA(FlatBufferBuilder builder, + public static Offset CreateSecondTableInA(FlatBufferBuilder builder, Offset refer_to_cOffset = default(Offset)) { builder.StartTable(1); SecondTableInA.AddReferToC(builder, refer_to_cOffset); @@ -28,9 +28,9 @@ public struct SecondTableInA : IFlatbufferObject public static void StartSecondTableInA(FlatBufferBuilder builder) { builder.StartTable(1); } public static void AddReferToC(FlatBufferBuilder builder, Offset referToCOffset) { builder.AddOffset(0, referToCOffset.Value, 0); } - public static Offset EndSecondTableInA(FlatBufferBuilder builder) { + public static Offset EndSecondTableInA(FlatBufferBuilder builder) { int o = builder.EndTable(); - return new Offset(o); + return new Offset(o); } }; diff --git a/tests/namespace_test/NamespaceA/TableInFirstNS.cs b/tests/namespace_test/NamespaceA/TableInFirstNS.cs index 85a9bfc4a..5f751a2e5 100644 --- a/tests/namespace_test/NamespaceA/TableInFirstNS.cs +++ b/tests/namespace_test/NamespaceA/TableInFirstNS.cs @@ -26,9 +26,9 @@ public struct TableInFirstNS : IFlatbufferObject public static void AddFooTable(FlatBufferBuilder builder, Offset fooTableOffset) { builder.AddOffset(0, fooTableOffset.Value, 0); } public static void AddFooEnum(FlatBufferBuilder builder, NamespaceA.NamespaceB.EnumInNestedNS fooEnum) { builder.AddSbyte(1, (sbyte)fooEnum, 0); } public static void AddFooStruct(FlatBufferBuilder builder, Offset fooStructOffset) { builder.AddStruct(2, fooStructOffset.Value, 0); } - public static Offset EndTableInFirstNS(FlatBufferBuilder builder) { + public static Offset EndTableInFirstNS(FlatBufferBuilder builder) { int o = builder.EndTable(); - return new Offset(o); + return new Offset(o); } }; diff --git a/tests/namespace_test/NamespaceC/TableInC.cs b/tests/namespace_test/NamespaceC/TableInC.cs index e523d8ec9..e0718a14f 100644 --- a/tests/namespace_test/NamespaceC/TableInC.cs +++ b/tests/namespace_test/NamespaceC/TableInC.cs @@ -20,7 +20,7 @@ public struct TableInC : IFlatbufferObject public NamespaceA.TableInFirstNS? ReferToA1 { get { int o = __p.__offset(4); return o != 0 ? (NamespaceA.TableInFirstNS?)(new NamespaceA.TableInFirstNS()).__assign(__p.__indirect(o + __p.bb_pos), __p.bb) : null; } } public NamespaceA.SecondTableInA? ReferToA2 { get { int o = __p.__offset(6); return o != 0 ? (NamespaceA.SecondTableInA?)(new NamespaceA.SecondTableInA()).__assign(__p.__indirect(o + __p.bb_pos), __p.bb) : null; } } - public static Offset CreateTableInC(FlatBufferBuilder builder, + public static Offset CreateTableInC(FlatBufferBuilder builder, Offset refer_to_a1Offset = default(Offset), Offset refer_to_a2Offset = default(Offset)) { builder.StartTable(2); @@ -32,9 +32,9 @@ public struct TableInC : IFlatbufferObject public static void StartTableInC(FlatBufferBuilder builder) { builder.StartTable(2); } public static void AddReferToA1(FlatBufferBuilder builder, Offset referToA1Offset) { builder.AddOffset(0, referToA1Offset.Value, 0); } public static void AddReferToA2(FlatBufferBuilder builder, Offset referToA2Offset) { builder.AddOffset(1, referToA2Offset.Value, 0); } - public static Offset EndTableInC(FlatBufferBuilder builder) { + public static Offset EndTableInC(FlatBufferBuilder builder) { int o = builder.EndTable(); - return new Offset(o); + return new Offset(o); } }; diff --git a/tests/namespace_test/namespace_test1_generated.h b/tests/namespace_test/namespace_test1_generated.h index a9cfed0a5..daaf7ae44 100644 --- a/tests/namespace_test/namespace_test1_generated.h +++ b/tests/namespace_test/namespace_test1_generated.h @@ -134,7 +134,7 @@ inline const flatbuffers::TypeTable *EnumInNestedNSTypeTable() { { flatbuffers::ET_CHAR, 0, 0 } }; static const flatbuffers::TypeFunction type_refs[] = { - EnumInNestedNSTypeTable + NamespaceA::NamespaceB::EnumInNestedNSTypeTable }; static const char * const names[] = { "A",