From 534c63bf57d1ae3fa589a02285ae120dd0248857 Mon Sep 17 00:00:00 2001 From: Nekotekina Date: Fri, 18 Dec 2020 11:19:05 +0300 Subject: [PATCH] Replace uint8_t with u8 --- rpcs3/Emu/Cell/Modules/StaticHLE.cpp | 2 +- rpcs3/Emu/Cell/Modules/StaticHLE.h | 2 +- rpcs3/Emu/Cell/Modules/cellRtc.cpp | 2 +- rpcs3/Emu/Cell/lv2/sys_gamepad.cpp | 24 +- rpcs3/Emu/Cell/lv2/sys_gamepad.h | 2 +- .../Emu/NP/generated/np2_structs_generated.h | 366 +++++++++--------- rpcs3/Emu/NP/rpcn_client.cpp | 8 +- rpcs3/Emu/RSX/rsx_utils.h | 2 +- 8 files changed, 204 insertions(+), 204 deletions(-) diff --git a/rpcs3/Emu/Cell/Modules/StaticHLE.cpp b/rpcs3/Emu/Cell/Modules/StaticHLE.cpp index b074172dae..57133cd11c 100644 --- a/rpcs3/Emu/Cell/Modules/StaticHLE.cpp +++ b/rpcs3/Emu/Cell/Modules/StaticHLE.cpp @@ -99,7 +99,7 @@ bool statichle_handler::load_patterns() #define POLY 0x8408 -uint16_t statichle_handler::gen_CRC16(const uint8_t* data_p, usz length) +uint16_t statichle_handler::gen_CRC16(const u8* data_p, usz length) { unsigned char i; unsigned int data; diff --git a/rpcs3/Emu/Cell/Modules/StaticHLE.h b/rpcs3/Emu/Cell/Modules/StaticHLE.h index 7c30219df6..523f02a3a0 100644 --- a/rpcs3/Emu/Cell/Modules/StaticHLE.h +++ b/rpcs3/Emu/Cell/Modules/StaticHLE.h @@ -26,7 +26,7 @@ public: bool check_against_patterns(vm::cptr& data, u32 size, u32 addr); protected: - uint16_t gen_CRC16(const uint8_t* data_p, usz length); + uint16_t gen_CRC16(const u8* data_p, usz length); std::vector hle_patterns; }; diff --git a/rpcs3/Emu/Cell/Modules/cellRtc.cpp b/rpcs3/Emu/Cell/Modules/cellRtc.cpp index 74d6f29b6d..9fd9dc3b19 100644 --- a/rpcs3/Emu/Cell/Modules/cellRtc.cpp +++ b/rpcs3/Emu/Cell/Modules/cellRtc.cpp @@ -825,7 +825,7 @@ error_code cellRtcSetTick(vm::ptr pTime, vm::cptr bool leap = is_leap_year(years); for (uint32_t m = 0; m <= 11; m++) { - uint8_t daysinmonth = DAYS_IN_MONTH[m + (leap * 12)]; + u8 daysinmonth = DAYS_IN_MONTH[m + (leap * 12)]; if (days_tmp >= daysinmonth) { months++; diff --git a/rpcs3/Emu/Cell/lv2/sys_gamepad.cpp b/rpcs3/Emu/Cell/lv2/sys_gamepad.cpp index 5101bd37c3..3a165fff81 100644 --- a/rpcs3/Emu/Cell/lv2/sys_gamepad.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_gamepad.cpp @@ -4,68 +4,68 @@ LOG_CHANNEL(sys_gamepad); -u32 sys_gamepad_ycon_initalize(vm::ptr in, vm::ptr out) +u32 sys_gamepad_ycon_initalize(vm::ptr in, vm::ptr out) { sys_gamepad.todo("sys_gamepad_ycon_initalize(in=%d, out=%d) -> CELL_OK", in, out); return CELL_OK; } -u32 sys_gamepad_ycon_finalize(vm::ptr in, vm::ptr out) +u32 sys_gamepad_ycon_finalize(vm::ptr in, vm::ptr out) { sys_gamepad.todo("sys_gamepad_ycon_finalize(in=%d, out=%d) -> CELL_OK", in, out); return CELL_OK; } -u32 sys_gamepad_ycon_has_input_ownership(vm::ptr in, vm::ptr out) +u32 sys_gamepad_ycon_has_input_ownership(vm::ptr in, vm::ptr out) { sys_gamepad.todo("sys_gamepad_ycon_has_input_ownership(in=%d, out=%d) -> CELL_OK", in, out); return CELL_OK; } -u32 sys_gamepad_ycon_enumerate_device(vm::ptr in, vm::ptr out) +u32 sys_gamepad_ycon_enumerate_device(vm::ptr in, vm::ptr out) { sys_gamepad.todo("sys_gamepad_ycon_enumerate_device(in=%d, out=%d) -> CELL_OK", in, out); return CELL_OK; } -u32 sys_gamepad_ycon_get_device_info(vm::ptr in, vm::ptr out) +u32 sys_gamepad_ycon_get_device_info(vm::ptr in, vm::ptr out) { sys_gamepad.todo("sys_gamepad_ycon_get_device_info(in=%d, out=%d) -> CELL_OK", in, out); return CELL_OK; } -u32 sys_gamepad_ycon_read_raw_report(vm::ptr in, vm::ptr out) +u32 sys_gamepad_ycon_read_raw_report(vm::ptr in, vm::ptr out) { sys_gamepad.todo("sys_gamepad_ycon_read_raw_report(in=%d, out=%d) -> CELL_OK", in, out); return CELL_OK; } -u32 sys_gamepad_ycon_write_raw_report(vm::ptr in, vm::ptr out) +u32 sys_gamepad_ycon_write_raw_report(vm::ptr in, vm::ptr out) { sys_gamepad.todo("sys_gamepad_ycon_write_raw_report(in=%d, out=%d) -> CELL_OK", in, out); return CELL_OK; } -u32 sys_gamepad_ycon_get_feature(vm::ptr in, vm::ptr out) +u32 sys_gamepad_ycon_get_feature(vm::ptr in, vm::ptr out) { sys_gamepad.todo("sys_gamepad_ycon_get_feature(in=%d, out=%d) -> CELL_OK", in, out); return CELL_OK; } -u32 sys_gamepad_ycon_set_feature(vm::ptr in, vm::ptr out) +u32 sys_gamepad_ycon_set_feature(vm::ptr in, vm::ptr out) { sys_gamepad.todo("sys_gamepad_ycon_set_feature(in=%d, out=%d) -> CELL_OK", in, out); return CELL_OK; } -u32 sys_gamepad_ycon_is_gem(vm::ptr in, vm::ptr out) +u32 sys_gamepad_ycon_is_gem(vm::ptr in, vm::ptr out) { sys_gamepad.todo("sys_gamepad_ycon_is_gem(in=%d, out=%d) -> CELL_OK", in, out); return CELL_OK; } -// syscall(621,packet_id,uint8_t *in,uint8_t *out) Talk:LV2_Functions_and_Syscalls#Syscall_621_.280x26D.29 gamepad_if usage -u32 sys_gamepad_ycon_if(uint8_t packet_id, vm::ptr in, vm::ptr out) +// syscall(621,packet_id,u8 *in,u8 *out) Talk:LV2_Functions_and_Syscalls#Syscall_621_.280x26D.29 gamepad_if usage +u32 sys_gamepad_ycon_if(u8 packet_id, vm::ptr in, vm::ptr out) { switch (packet_id) diff --git a/rpcs3/Emu/Cell/lv2/sys_gamepad.h b/rpcs3/Emu/Cell/lv2/sys_gamepad.h index 51690e49a5..832d8553cc 100644 --- a/rpcs3/Emu/Cell/lv2/sys_gamepad.h +++ b/rpcs3/Emu/Cell/lv2/sys_gamepad.h @@ -4,4 +4,4 @@ //Syscalls -u32 sys_gamepad_ycon_if(uint8_t packet_id, vm::ptr in, vm::ptr out); +u32 sys_gamepad_ycon_if(u8 packet_id, vm::ptr in, vm::ptr out); diff --git a/rpcs3/Emu/NP/generated/np2_structs_generated.h b/rpcs3/Emu/NP/generated/np2_structs_generated.h index 28930c35ae..0aa7921e5f 100644 --- a/rpcs3/Emu/NP/generated/np2_structs_generated.h +++ b/rpcs3/Emu/NP/generated/np2_structs_generated.h @@ -70,8 +70,8 @@ struct BinAttr FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { uint16_t id() const { return GetField(VT_ID, 0); } - const flatbuffers::Vector *data() const { - return GetPointer *>(VT_DATA); + const flatbuffers::Vector *data() const { + return GetPointer *>(VT_DATA); } bool Verify(flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && @@ -88,7 +88,7 @@ struct BinAttrBuilder { void add_id(uint16_t id) { fbb_.AddElement(BinAttr::VT_ID, id, 0); } - void add_data(flatbuffers::Offset> data) { + void add_data(flatbuffers::Offset> data) { fbb_.AddOffset(BinAttr::VT_DATA, data); } explicit BinAttrBuilder(flatbuffers::FlatBufferBuilder &_fbb) @@ -106,7 +106,7 @@ struct BinAttrBuilder { inline flatbuffers::Offset CreateBinAttr( flatbuffers::FlatBufferBuilder &_fbb, uint16_t id = 0, - flatbuffers::Offset> data = 0) { + flatbuffers::Offset> data = 0) { BinAttrBuilder builder_(_fbb); builder_.add_data(data); builder_.add_id(id); @@ -116,8 +116,8 @@ inline flatbuffers::Offset CreateBinAttr( inline flatbuffers::Offset CreateBinAttrDirect( flatbuffers::FlatBufferBuilder &_fbb, uint16_t id = 0, - const std::vector *data = nullptr) { - auto data__ = data ? _fbb.CreateVector(*data) : 0; + const std::vector *data = nullptr) { + auto data__ = data ? _fbb.CreateVector(*data) : 0; return CreateBinAttr( _fbb, id, @@ -292,19 +292,19 @@ struct OptParam FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { VT_FLAG = 6, VT_HUBMEMBERID = 8 }; - uint8_t type() const { - return GetField(VT_TYPE, 0); + u8 type() const { + return GetField(VT_TYPE, 0); } - uint8_t flag() const { - return GetField(VT_FLAG, 0); + u8 flag() const { + return GetField(VT_FLAG, 0); } uint16_t hubMemberId() const { return GetField(VT_HUBMEMBERID, 0); } bool Verify(flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && - VerifyField(verifier, VT_TYPE) && - VerifyField(verifier, VT_FLAG) && + VerifyField(verifier, VT_TYPE) && + VerifyField(verifier, VT_FLAG) && VerifyField(verifier, VT_HUBMEMBERID) && verifier.EndTable(); } @@ -313,11 +313,11 @@ struct OptParam FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { struct OptParamBuilder { flatbuffers::FlatBufferBuilder &fbb_; flatbuffers::uoffset_t start_; - void add_type(uint8_t type) { - fbb_.AddElement(OptParam::VT_TYPE, type, 0); + void add_type(u8 type) { + fbb_.AddElement(OptParam::VT_TYPE, type, 0); } - void add_flag(uint8_t flag) { - fbb_.AddElement(OptParam::VT_FLAG, flag, 0); + void add_flag(u8 flag) { + fbb_.AddElement(OptParam::VT_FLAG, flag, 0); } void add_hubMemberId(uint16_t hubMemberId) { fbb_.AddElement(OptParam::VT_HUBMEMBERID, hubMemberId, 0); @@ -336,8 +336,8 @@ struct OptParamBuilder { inline flatbuffers::Offset CreateOptParam( flatbuffers::FlatBufferBuilder &_fbb, - uint8_t type = 0, - uint8_t flag = 0, + u8 type = 0, + u8 flag = 0, uint16_t hubMemberId = 0) { OptParamBuilder builder_(_fbb); builder_.add_hubMemberId(hubMemberId); @@ -357,21 +357,21 @@ struct GroupConfig FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { return GetField(VT_SLOTNUM, 0); } bool withLabel() const { - return GetField(VT_WITHLABEL, 0) != 0; + return GetField(VT_WITHLABEL, 0) != 0; } - const flatbuffers::Vector *label() const { - return GetPointer *>(VT_LABEL); + const flatbuffers::Vector *label() const { + return GetPointer *>(VT_LABEL); } bool withPassword() const { - return GetField(VT_WITHPASSWORD, 0) != 0; + return GetField(VT_WITHPASSWORD, 0) != 0; } bool Verify(flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && VerifyField(verifier, VT_SLOTNUM) && - VerifyField(verifier, VT_WITHLABEL) && + VerifyField(verifier, VT_WITHLABEL) && VerifyOffset(verifier, VT_LABEL) && verifier.VerifyVector(label()) && - VerifyField(verifier, VT_WITHPASSWORD) && + VerifyField(verifier, VT_WITHPASSWORD) && verifier.EndTable(); } }; @@ -383,13 +383,13 @@ struct GroupConfigBuilder { fbb_.AddElement(GroupConfig::VT_SLOTNUM, slotNum, 0); } void add_withLabel(bool withLabel) { - fbb_.AddElement(GroupConfig::VT_WITHLABEL, static_cast(withLabel), 0); + fbb_.AddElement(GroupConfig::VT_WITHLABEL, static_cast(withLabel), 0); } - void add_label(flatbuffers::Offset> label) { + void add_label(flatbuffers::Offset> label) { fbb_.AddOffset(GroupConfig::VT_LABEL, label); } void add_withPassword(bool withPassword) { - fbb_.AddElement(GroupConfig::VT_WITHPASSWORD, static_cast(withPassword), 0); + fbb_.AddElement(GroupConfig::VT_WITHPASSWORD, static_cast(withPassword), 0); } explicit GroupConfigBuilder(flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { @@ -407,7 +407,7 @@ inline flatbuffers::Offset CreateGroupConfig( flatbuffers::FlatBufferBuilder &_fbb, uint32_t slotNum = 0, bool withLabel = false, - flatbuffers::Offset> label = 0, + flatbuffers::Offset> label = 0, bool withPassword = false) { GroupConfigBuilder builder_(_fbb); builder_.add_label(label); @@ -421,9 +421,9 @@ inline flatbuffers::Offset CreateGroupConfigDirect( flatbuffers::FlatBufferBuilder &_fbb, uint32_t slotNum = 0, bool withLabel = false, - const std::vector *label = nullptr, + const std::vector *label = nullptr, bool withPassword = false) { - auto label__ = label ? _fbb.CreateVector(*label) : 0; + auto label__ = label ? _fbb.CreateVector(*label) : 0; return CreateGroupConfig( _fbb, slotNum, @@ -530,14 +530,14 @@ struct RoomMemberDataInternal FLATBUFFERS_FINAL_CLASS : private flatbuffers::Tab uint16_t memberId() const { return GetField(VT_MEMBERID, 0); } - uint8_t teamId() const { - return GetField(VT_TEAMID, 0); + u8 teamId() const { + return GetField(VT_TEAMID, 0); } - uint8_t roomGroup() const { - return GetField(VT_ROOMGROUP, 0); + u8 roomGroup() const { + return GetField(VT_ROOMGROUP, 0); } - uint8_t natType() const { - return GetField(VT_NATTYPE, 0); + u8 natType() const { + return GetField(VT_NATTYPE, 0); } uint32_t flagAttr() const { return GetField(VT_FLAGATTR, 0); @@ -551,9 +551,9 @@ struct RoomMemberDataInternal FLATBUFFERS_FINAL_CLASS : private flatbuffers::Tab verifier.VerifyTable(userInfo()) && VerifyField(verifier, VT_JOINDATE) && VerifyField(verifier, VT_MEMBERID) && - VerifyField(verifier, VT_TEAMID) && - VerifyField(verifier, VT_ROOMGROUP) && - VerifyField(verifier, VT_NATTYPE) && + VerifyField(verifier, VT_TEAMID) && + VerifyField(verifier, VT_ROOMGROUP) && + VerifyField(verifier, VT_NATTYPE) && VerifyField(verifier, VT_FLAGATTR) && VerifyOffset(verifier, VT_ROOMMEMBERBINATTRINTERNAL) && verifier.VerifyVector(roomMemberBinAttrInternal()) && @@ -574,14 +574,14 @@ struct RoomMemberDataInternalBuilder { void add_memberId(uint16_t memberId) { fbb_.AddElement(RoomMemberDataInternal::VT_MEMBERID, memberId, 0); } - void add_teamId(uint8_t teamId) { - fbb_.AddElement(RoomMemberDataInternal::VT_TEAMID, teamId, 0); + void add_teamId(u8 teamId) { + fbb_.AddElement(RoomMemberDataInternal::VT_TEAMID, teamId, 0); } - void add_roomGroup(uint8_t roomGroup) { - fbb_.AddElement(RoomMemberDataInternal::VT_ROOMGROUP, roomGroup, 0); + void add_roomGroup(u8 roomGroup) { + fbb_.AddElement(RoomMemberDataInternal::VT_ROOMGROUP, roomGroup, 0); } - void add_natType(uint8_t natType) { - fbb_.AddElement(RoomMemberDataInternal::VT_NATTYPE, natType, 0); + void add_natType(u8 natType) { + fbb_.AddElement(RoomMemberDataInternal::VT_NATTYPE, natType, 0); } void add_flagAttr(uint32_t flagAttr) { fbb_.AddElement(RoomMemberDataInternal::VT_FLAGATTR, flagAttr, 0); @@ -606,9 +606,9 @@ inline flatbuffers::Offset CreateRoomMemberDataInternal( flatbuffers::Offset userInfo = 0, uint64_t joinDate = 0, uint16_t memberId = 0, - uint8_t teamId = 0, - uint8_t roomGroup = 0, - uint8_t natType = 0, + u8 teamId = 0, + u8 roomGroup = 0, + u8 natType = 0, uint32_t flagAttr = 0, flatbuffers::Offset>> roomMemberBinAttrInternal = 0) { RoomMemberDataInternalBuilder builder_(_fbb); @@ -628,9 +628,9 @@ inline flatbuffers::Offset CreateRoomMemberDataInternalD flatbuffers::Offset userInfo = 0, uint64_t joinDate = 0, uint16_t memberId = 0, - uint8_t teamId = 0, - uint8_t roomGroup = 0, - uint8_t natType = 0, + u8 teamId = 0, + u8 roomGroup = 0, + u8 natType = 0, uint32_t flagAttr = 0, const std::vector> *roomMemberBinAttrInternal = nullptr) { auto roomMemberBinAttrInternal__ = roomMemberBinAttrInternal ? _fbb.CreateVector>(*roomMemberBinAttrInternal) : 0; @@ -655,17 +655,17 @@ struct RoomGroup FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { VT_SLOTNUM = 12, VT_CURGROUPMEMBERNUM = 14 }; - uint8_t groupId() const { - return GetField(VT_GROUPID, 0); + u8 groupId() const { + return GetField(VT_GROUPID, 0); } bool withPassword() const { - return GetField(VT_WITHPASSWORD, 0) != 0; + return GetField(VT_WITHPASSWORD, 0) != 0; } bool withLabel() const { - return GetField(VT_WITHLABEL, 0) != 0; + return GetField(VT_WITHLABEL, 0) != 0; } - const flatbuffers::Vector *label() const { - return GetPointer *>(VT_LABEL); + const flatbuffers::Vector *label() const { + return GetPointer *>(VT_LABEL); } uint32_t slotNum() const { return GetField(VT_SLOTNUM, 0); @@ -675,9 +675,9 @@ struct RoomGroup FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { } bool Verify(flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && - VerifyField(verifier, VT_GROUPID) && - VerifyField(verifier, VT_WITHPASSWORD) && - VerifyField(verifier, VT_WITHLABEL) && + VerifyField(verifier, VT_GROUPID) && + VerifyField(verifier, VT_WITHPASSWORD) && + VerifyField(verifier, VT_WITHLABEL) && VerifyOffset(verifier, VT_LABEL) && verifier.VerifyVector(label()) && VerifyField(verifier, VT_SLOTNUM) && @@ -689,16 +689,16 @@ struct RoomGroup FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { struct RoomGroupBuilder { flatbuffers::FlatBufferBuilder &fbb_; flatbuffers::uoffset_t start_; - void add_groupId(uint8_t groupId) { - fbb_.AddElement(RoomGroup::VT_GROUPID, groupId, 0); + void add_groupId(u8 groupId) { + fbb_.AddElement(RoomGroup::VT_GROUPID, groupId, 0); } void add_withPassword(bool withPassword) { - fbb_.AddElement(RoomGroup::VT_WITHPASSWORD, static_cast(withPassword), 0); + fbb_.AddElement(RoomGroup::VT_WITHPASSWORD, static_cast(withPassword), 0); } void add_withLabel(bool withLabel) { - fbb_.AddElement(RoomGroup::VT_WITHLABEL, static_cast(withLabel), 0); + fbb_.AddElement(RoomGroup::VT_WITHLABEL, static_cast(withLabel), 0); } - void add_label(flatbuffers::Offset> label) { + void add_label(flatbuffers::Offset> label) { fbb_.AddOffset(RoomGroup::VT_LABEL, label); } void add_slotNum(uint32_t slotNum) { @@ -721,10 +721,10 @@ struct RoomGroupBuilder { inline flatbuffers::Offset CreateRoomGroup( flatbuffers::FlatBufferBuilder &_fbb, - uint8_t groupId = 0, + u8 groupId = 0, bool withPassword = false, bool withLabel = false, - flatbuffers::Offset> label = 0, + flatbuffers::Offset> label = 0, uint32_t slotNum = 0, uint32_t curGroupMemberNum = 0) { RoomGroupBuilder builder_(_fbb); @@ -739,13 +739,13 @@ inline flatbuffers::Offset CreateRoomGroup( inline flatbuffers::Offset CreateRoomGroupDirect( flatbuffers::FlatBufferBuilder &_fbb, - uint8_t groupId = 0, + u8 groupId = 0, bool withPassword = false, bool withLabel = false, - const std::vector *label = nullptr, + const std::vector *label = nullptr, uint32_t slotNum = 0, uint32_t curGroupMemberNum = 0) { - auto label__ = label ? _fbb.CreateVector(*label) : 0; + auto label__ = label ? _fbb.CreateVector(*label) : 0; return CreateRoomGroup( _fbb, groupId, @@ -1191,15 +1191,15 @@ struct IntSearchFilter FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { VT_SEARCHOPERATOR = 4, VT_ATTR = 6 }; - uint8_t searchOperator() const { - return GetField(VT_SEARCHOPERATOR, 0); + u8 searchOperator() const { + return GetField(VT_SEARCHOPERATOR, 0); } const IntAttr *attr() const { return GetPointer(VT_ATTR); } bool Verify(flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && - VerifyField(verifier, VT_SEARCHOPERATOR) && + VerifyField(verifier, VT_SEARCHOPERATOR) && VerifyOffset(verifier, VT_ATTR) && verifier.VerifyTable(attr()) && verifier.EndTable(); @@ -1209,8 +1209,8 @@ struct IntSearchFilter FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { struct IntSearchFilterBuilder { flatbuffers::FlatBufferBuilder &fbb_; flatbuffers::uoffset_t start_; - void add_searchOperator(uint8_t searchOperator) { - fbb_.AddElement(IntSearchFilter::VT_SEARCHOPERATOR, searchOperator, 0); + void add_searchOperator(u8 searchOperator) { + fbb_.AddElement(IntSearchFilter::VT_SEARCHOPERATOR, searchOperator, 0); } void add_attr(flatbuffers::Offset attr) { fbb_.AddOffset(IntSearchFilter::VT_ATTR, attr); @@ -1229,7 +1229,7 @@ struct IntSearchFilterBuilder { inline flatbuffers::Offset CreateIntSearchFilter( flatbuffers::FlatBufferBuilder &_fbb, - uint8_t searchOperator = 0, + u8 searchOperator = 0, flatbuffers::Offset attr = 0) { IntSearchFilterBuilder builder_(_fbb); builder_.add_attr(attr); @@ -1242,15 +1242,15 @@ struct BinSearchFilter FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { VT_SEARCHOPERATOR = 4, VT_ATTR = 6 }; - uint8_t searchOperator() const { - return GetField(VT_SEARCHOPERATOR, 0); + u8 searchOperator() const { + return GetField(VT_SEARCHOPERATOR, 0); } const BinAttr *attr() const { return GetPointer(VT_ATTR); } bool Verify(flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && - VerifyField(verifier, VT_SEARCHOPERATOR) && + VerifyField(verifier, VT_SEARCHOPERATOR) && VerifyOffset(verifier, VT_ATTR) && verifier.VerifyTable(attr()) && verifier.EndTable(); @@ -1260,8 +1260,8 @@ struct BinSearchFilter FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { struct BinSearchFilterBuilder { flatbuffers::FlatBufferBuilder &fbb_; flatbuffers::uoffset_t start_; - void add_searchOperator(uint8_t searchOperator) { - fbb_.AddElement(BinSearchFilter::VT_SEARCHOPERATOR, searchOperator, 0); + void add_searchOperator(u8 searchOperator) { + fbb_.AddElement(BinSearchFilter::VT_SEARCHOPERATOR, searchOperator, 0); } void add_attr(flatbuffers::Offset attr) { fbb_.AddOffset(BinSearchFilter::VT_ATTR, attr); @@ -1280,7 +1280,7 @@ struct BinSearchFilterBuilder { inline flatbuffers::Offset CreateBinSearchFilter( flatbuffers::FlatBufferBuilder &_fbb, - uint8_t searchOperator = 0, + u8 searchOperator = 0, flatbuffers::Offset attr = 0) { BinSearchFilterBuilder builder_(_fbb); builder_.add_attr(attr); @@ -1293,8 +1293,8 @@ struct PresenceOptionData FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { VT_DATA = 4, VT_LEN = 6 }; - const flatbuffers::Vector *data() const { - return GetPointer *>(VT_DATA); + const flatbuffers::Vector *data() const { + return GetPointer *>(VT_DATA); } uint32_t len() const { return GetField(VT_LEN, 0); @@ -1311,7 +1311,7 @@ struct PresenceOptionData FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { struct PresenceOptionDataBuilder { flatbuffers::FlatBufferBuilder &fbb_; flatbuffers::uoffset_t start_; - void add_data(flatbuffers::Offset> data) { + void add_data(flatbuffers::Offset> data) { fbb_.AddOffset(PresenceOptionData::VT_DATA, data); } void add_len(uint32_t len) { @@ -1331,7 +1331,7 @@ struct PresenceOptionDataBuilder { inline flatbuffers::Offset CreatePresenceOptionData( flatbuffers::FlatBufferBuilder &_fbb, - flatbuffers::Offset> data = 0, + flatbuffers::Offset> data = 0, uint32_t len = 0) { PresenceOptionDataBuilder builder_(_fbb); builder_.add_len(len); @@ -1341,9 +1341,9 @@ inline flatbuffers::Offset CreatePresenceOptionData( inline flatbuffers::Offset CreatePresenceOptionDataDirect( flatbuffers::FlatBufferBuilder &_fbb, - const std::vector *data = nullptr, + const std::vector *data = nullptr, uint32_t len = 0) { - auto data__ = data ? _fbb.CreateVector(*data) : 0; + auto data__ = data ? _fbb.CreateVector(*data) : 0; return CreatePresenceOptionData( _fbb, data__, @@ -1355,17 +1355,17 @@ struct RoomGroupPasswordConfig FLATBUFFERS_FINAL_CLASS : private flatbuffers::Ta VT_GROUPID = 4, VT_WITHPASSWORD = 6 }; - const flatbuffers::Vector *groupId() const { - return GetPointer *>(VT_GROUPID); + const flatbuffers::Vector *groupId() const { + return GetPointer *>(VT_GROUPID); } bool withPassword() const { - return GetField(VT_WITHPASSWORD, 0) != 0; + return GetField(VT_WITHPASSWORD, 0) != 0; } bool Verify(flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && VerifyOffset(verifier, VT_GROUPID) && verifier.VerifyVector(groupId()) && - VerifyField(verifier, VT_WITHPASSWORD) && + VerifyField(verifier, VT_WITHPASSWORD) && verifier.EndTable(); } }; @@ -1373,11 +1373,11 @@ struct RoomGroupPasswordConfig FLATBUFFERS_FINAL_CLASS : private flatbuffers::Ta struct RoomGroupPasswordConfigBuilder { flatbuffers::FlatBufferBuilder &fbb_; flatbuffers::uoffset_t start_; - void add_groupId(flatbuffers::Offset> groupId) { + void add_groupId(flatbuffers::Offset> groupId) { fbb_.AddOffset(RoomGroupPasswordConfig::VT_GROUPID, groupId); } void add_withPassword(bool withPassword) { - fbb_.AddElement(RoomGroupPasswordConfig::VT_WITHPASSWORD, static_cast(withPassword), 0); + fbb_.AddElement(RoomGroupPasswordConfig::VT_WITHPASSWORD, static_cast(withPassword), 0); } explicit RoomGroupPasswordConfigBuilder(flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { @@ -1393,7 +1393,7 @@ struct RoomGroupPasswordConfigBuilder { inline flatbuffers::Offset CreateRoomGroupPasswordConfig( flatbuffers::FlatBufferBuilder &_fbb, - flatbuffers::Offset> groupId = 0, + flatbuffers::Offset> groupId = 0, bool withPassword = false) { RoomGroupPasswordConfigBuilder builder_(_fbb); builder_.add_groupId(groupId); @@ -1403,9 +1403,9 @@ inline flatbuffers::Offset CreateRoomGroupPasswordConfi inline flatbuffers::Offset CreateRoomGroupPasswordConfigDirect( flatbuffers::FlatBufferBuilder &_fbb, - const std::vector *groupId = nullptr, + const std::vector *groupId = nullptr, bool withPassword = false) { - auto groupId__ = groupId ? _fbb.CreateVector(*groupId) : 0; + auto groupId__ = groupId ? _fbb.CreateVector(*groupId) : 0; return CreateRoomGroupPasswordConfig( _fbb, groupId__, @@ -1707,8 +1707,8 @@ struct CreateJoinRoomRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Tabl const flatbuffers::Vector> *roomBinAttrExternal() const { return GetPointer> *>(VT_ROOMBINATTREXTERNAL); } - const flatbuffers::Vector *roomPassword() const { - return GetPointer *>(VT_ROOMPASSWORD); + const flatbuffers::Vector *roomPassword() const { + return GetPointer *>(VT_ROOMPASSWORD); } const flatbuffers::Vector> *groupConfig() const { return GetPointer> *>(VT_GROUPCONFIG); @@ -1722,14 +1722,14 @@ struct CreateJoinRoomRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Tabl const flatbuffers::Vector> *blockedUser() const { return GetPointer> *>(VT_BLOCKEDUSER); } - const flatbuffers::Vector *joinRoomGroupLabel() const { - return GetPointer *>(VT_JOINROOMGROUPLABEL); + const flatbuffers::Vector *joinRoomGroupLabel() const { + return GetPointer *>(VT_JOINROOMGROUPLABEL); } const flatbuffers::Vector> *roomMemberBinAttrInternal() const { return GetPointer> *>(VT_ROOMMEMBERBINATTRINTERNAL); } - uint8_t teamId() const { - return GetField(VT_TEAMID, 0); + u8 teamId() const { + return GetField(VT_TEAMID, 0); } const OptParam *sigOptParam() const { return GetPointer(VT_SIGOPTPARAM); @@ -1769,7 +1769,7 @@ struct CreateJoinRoomRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Tabl VerifyOffset(verifier, VT_ROOMMEMBERBINATTRINTERNAL) && verifier.VerifyVector(roomMemberBinAttrInternal()) && verifier.VerifyVectorOfTables(roomMemberBinAttrInternal()) && - VerifyField(verifier, VT_TEAMID) && + VerifyField(verifier, VT_TEAMID) && VerifyOffset(verifier, VT_SIGOPTPARAM) && verifier.VerifyTable(sigOptParam()) && verifier.EndTable(); @@ -1803,7 +1803,7 @@ struct CreateJoinRoomRequestBuilder { void add_roomBinAttrExternal(flatbuffers::Offset>> roomBinAttrExternal) { fbb_.AddOffset(CreateJoinRoomRequest::VT_ROOMBINATTREXTERNAL, roomBinAttrExternal); } - void add_roomPassword(flatbuffers::Offset> roomPassword) { + void add_roomPassword(flatbuffers::Offset> roomPassword) { fbb_.AddOffset(CreateJoinRoomRequest::VT_ROOMPASSWORD, roomPassword); } void add_groupConfig(flatbuffers::Offset>> groupConfig) { @@ -1818,14 +1818,14 @@ struct CreateJoinRoomRequestBuilder { void add_blockedUser(flatbuffers::Offset>> blockedUser) { fbb_.AddOffset(CreateJoinRoomRequest::VT_BLOCKEDUSER, blockedUser); } - void add_joinRoomGroupLabel(flatbuffers::Offset> joinRoomGroupLabel) { + void add_joinRoomGroupLabel(flatbuffers::Offset> joinRoomGroupLabel) { fbb_.AddOffset(CreateJoinRoomRequest::VT_JOINROOMGROUPLABEL, joinRoomGroupLabel); } void add_roomMemberBinAttrInternal(flatbuffers::Offset>> roomMemberBinAttrInternal) { fbb_.AddOffset(CreateJoinRoomRequest::VT_ROOMMEMBERBINATTRINTERNAL, roomMemberBinAttrInternal); } - void add_teamId(uint8_t teamId) { - fbb_.AddElement(CreateJoinRoomRequest::VT_TEAMID, teamId, 0); + void add_teamId(u8 teamId) { + fbb_.AddElement(CreateJoinRoomRequest::VT_TEAMID, teamId, 0); } void add_sigOptParam(flatbuffers::Offset sigOptParam) { fbb_.AddOffset(CreateJoinRoomRequest::VT_SIGOPTPARAM, sigOptParam); @@ -1852,14 +1852,14 @@ inline flatbuffers::Offset CreateCreateJoinRoomRequest( flatbuffers::Offset>> roomSearchableIntAttrExternal = 0, flatbuffers::Offset>> roomSearchableBinAttrExternal = 0, flatbuffers::Offset>> roomBinAttrExternal = 0, - flatbuffers::Offset> roomPassword = 0, + flatbuffers::Offset> roomPassword = 0, flatbuffers::Offset>> groupConfig = 0, uint64_t passwordSlotMask = 0, flatbuffers::Offset>> allowedUser = 0, flatbuffers::Offset>> blockedUser = 0, - flatbuffers::Offset> joinRoomGroupLabel = 0, + flatbuffers::Offset> joinRoomGroupLabel = 0, flatbuffers::Offset>> roomMemberBinAttrInternal = 0, - uint8_t teamId = 0, + u8 teamId = 0, flatbuffers::Offset sigOptParam = 0) { CreateJoinRoomRequestBuilder builder_(_fbb); builder_.add_passwordSlotMask(passwordSlotMask); @@ -1892,24 +1892,24 @@ inline flatbuffers::Offset CreateCreateJoinRoomRequestDir const std::vector> *roomSearchableIntAttrExternal = nullptr, const std::vector> *roomSearchableBinAttrExternal = nullptr, const std::vector> *roomBinAttrExternal = nullptr, - const std::vector *roomPassword = nullptr, + const std::vector *roomPassword = nullptr, const std::vector> *groupConfig = nullptr, uint64_t passwordSlotMask = 0, const std::vector> *allowedUser = nullptr, const std::vector> *blockedUser = nullptr, - const std::vector *joinRoomGroupLabel = nullptr, + const std::vector *joinRoomGroupLabel = nullptr, const std::vector> *roomMemberBinAttrInternal = nullptr, - uint8_t teamId = 0, + u8 teamId = 0, flatbuffers::Offset sigOptParam = 0) { auto roomBinAttrInternal__ = roomBinAttrInternal ? _fbb.CreateVector>(*roomBinAttrInternal) : 0; auto roomSearchableIntAttrExternal__ = roomSearchableIntAttrExternal ? _fbb.CreateVector>(*roomSearchableIntAttrExternal) : 0; auto roomSearchableBinAttrExternal__ = roomSearchableBinAttrExternal ? _fbb.CreateVector>(*roomSearchableBinAttrExternal) : 0; auto roomBinAttrExternal__ = roomBinAttrExternal ? _fbb.CreateVector>(*roomBinAttrExternal) : 0; - auto roomPassword__ = roomPassword ? _fbb.CreateVector(*roomPassword) : 0; + auto roomPassword__ = roomPassword ? _fbb.CreateVector(*roomPassword) : 0; auto groupConfig__ = groupConfig ? _fbb.CreateVector>(*groupConfig) : 0; auto allowedUser__ = allowedUser ? _fbb.CreateVector>(*allowedUser) : 0; auto blockedUser__ = blockedUser ? _fbb.CreateVector>(*blockedUser) : 0; - auto joinRoomGroupLabel__ = joinRoomGroupLabel ? _fbb.CreateVector(*joinRoomGroupLabel) : 0; + auto joinRoomGroupLabel__ = joinRoomGroupLabel ? _fbb.CreateVector(*joinRoomGroupLabel) : 0; auto roomMemberBinAttrInternal__ = roomMemberBinAttrInternal ? _fbb.CreateVector>(*roomMemberBinAttrInternal) : 0; return CreateCreateJoinRoomRequest( _fbb, @@ -1944,11 +1944,11 @@ struct JoinRoomRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { uint64_t roomId() const { return GetField(VT_ROOMID, 0); } - const flatbuffers::Vector *roomPassword() const { - return GetPointer *>(VT_ROOMPASSWORD); + const flatbuffers::Vector *roomPassword() const { + return GetPointer *>(VT_ROOMPASSWORD); } - const flatbuffers::Vector *joinRoomGroupLabel() const { - return GetPointer *>(VT_JOINROOMGROUPLABEL); + const flatbuffers::Vector *joinRoomGroupLabel() const { + return GetPointer *>(VT_JOINROOMGROUPLABEL); } const flatbuffers::Vector> *roomMemberBinAttrInternal() const { return GetPointer> *>(VT_ROOMMEMBERBINATTRINTERNAL); @@ -1956,8 +1956,8 @@ struct JoinRoomRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { const PresenceOptionData *optData() const { return GetPointer(VT_OPTDATA); } - uint8_t teamId() const { - return GetField(VT_TEAMID, 0); + u8 teamId() const { + return GetField(VT_TEAMID, 0); } bool Verify(flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && @@ -1971,7 +1971,7 @@ struct JoinRoomRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { verifier.VerifyVectorOfTables(roomMemberBinAttrInternal()) && VerifyOffset(verifier, VT_OPTDATA) && verifier.VerifyTable(optData()) && - VerifyField(verifier, VT_TEAMID) && + VerifyField(verifier, VT_TEAMID) && verifier.EndTable(); } }; @@ -1982,10 +1982,10 @@ struct JoinRoomRequestBuilder { void add_roomId(uint64_t roomId) { fbb_.AddElement(JoinRoomRequest::VT_ROOMID, roomId, 0); } - void add_roomPassword(flatbuffers::Offset> roomPassword) { + void add_roomPassword(flatbuffers::Offset> roomPassword) { fbb_.AddOffset(JoinRoomRequest::VT_ROOMPASSWORD, roomPassword); } - void add_joinRoomGroupLabel(flatbuffers::Offset> joinRoomGroupLabel) { + void add_joinRoomGroupLabel(flatbuffers::Offset> joinRoomGroupLabel) { fbb_.AddOffset(JoinRoomRequest::VT_JOINROOMGROUPLABEL, joinRoomGroupLabel); } void add_roomMemberBinAttrInternal(flatbuffers::Offset>> roomMemberBinAttrInternal) { @@ -1994,8 +1994,8 @@ struct JoinRoomRequestBuilder { void add_optData(flatbuffers::Offset optData) { fbb_.AddOffset(JoinRoomRequest::VT_OPTDATA, optData); } - void add_teamId(uint8_t teamId) { - fbb_.AddElement(JoinRoomRequest::VT_TEAMID, teamId, 0); + void add_teamId(u8 teamId) { + fbb_.AddElement(JoinRoomRequest::VT_TEAMID, teamId, 0); } explicit JoinRoomRequestBuilder(flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { @@ -2012,11 +2012,11 @@ struct JoinRoomRequestBuilder { inline flatbuffers::Offset CreateJoinRoomRequest( flatbuffers::FlatBufferBuilder &_fbb, uint64_t roomId = 0, - flatbuffers::Offset> roomPassword = 0, - flatbuffers::Offset> joinRoomGroupLabel = 0, + flatbuffers::Offset> roomPassword = 0, + flatbuffers::Offset> joinRoomGroupLabel = 0, flatbuffers::Offset>> roomMemberBinAttrInternal = 0, flatbuffers::Offset optData = 0, - uint8_t teamId = 0) { + u8 teamId = 0) { JoinRoomRequestBuilder builder_(_fbb); builder_.add_roomId(roomId); builder_.add_optData(optData); @@ -2030,13 +2030,13 @@ inline flatbuffers::Offset CreateJoinRoomRequest( inline flatbuffers::Offset CreateJoinRoomRequestDirect( flatbuffers::FlatBufferBuilder &_fbb, uint64_t roomId = 0, - const std::vector *roomPassword = nullptr, - const std::vector *joinRoomGroupLabel = nullptr, + const std::vector *roomPassword = nullptr, + const std::vector *joinRoomGroupLabel = nullptr, const std::vector> *roomMemberBinAttrInternal = nullptr, flatbuffers::Offset optData = 0, - uint8_t teamId = 0) { - auto roomPassword__ = roomPassword ? _fbb.CreateVector(*roomPassword) : 0; - auto joinRoomGroupLabel__ = joinRoomGroupLabel ? _fbb.CreateVector(*joinRoomGroupLabel) : 0; + u8 teamId = 0) { + auto roomPassword__ = roomPassword ? _fbb.CreateVector(*roomPassword) : 0; + auto joinRoomGroupLabel__ = joinRoomGroupLabel ? _fbb.CreateVector(*joinRoomGroupLabel) : 0; auto roomMemberBinAttrInternal__ = roomMemberBinAttrInternal ? _fbb.CreateVector>(*roomMemberBinAttrInternal) : 0; return CreateJoinRoomRequest( _fbb, @@ -2391,8 +2391,8 @@ struct RoomMemberUpdateInfo FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table const RoomMemberDataInternal *roomMemberDataInternal() const { return GetPointer(VT_ROOMMEMBERDATAINTERNAL); } - uint8_t eventCause() const { - return GetField(VT_EVENTCAUSE, 0); + u8 eventCause() const { + return GetField(VT_EVENTCAUSE, 0); } const PresenceOptionData *optData() const { return GetPointer(VT_OPTDATA); @@ -2401,7 +2401,7 @@ struct RoomMemberUpdateInfo FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table return VerifyTableStart(verifier) && VerifyOffset(verifier, VT_ROOMMEMBERDATAINTERNAL) && verifier.VerifyTable(roomMemberDataInternal()) && - VerifyField(verifier, VT_EVENTCAUSE) && + VerifyField(verifier, VT_EVENTCAUSE) && VerifyOffset(verifier, VT_OPTDATA) && verifier.VerifyTable(optData()) && verifier.EndTable(); @@ -2414,8 +2414,8 @@ struct RoomMemberUpdateInfoBuilder { void add_roomMemberDataInternal(flatbuffers::Offset roomMemberDataInternal) { fbb_.AddOffset(RoomMemberUpdateInfo::VT_ROOMMEMBERDATAINTERNAL, roomMemberDataInternal); } - void add_eventCause(uint8_t eventCause) { - fbb_.AddElement(RoomMemberUpdateInfo::VT_EVENTCAUSE, eventCause, 0); + void add_eventCause(u8 eventCause) { + fbb_.AddElement(RoomMemberUpdateInfo::VT_EVENTCAUSE, eventCause, 0); } void add_optData(flatbuffers::Offset optData) { fbb_.AddOffset(RoomMemberUpdateInfo::VT_OPTDATA, optData); @@ -2435,7 +2435,7 @@ struct RoomMemberUpdateInfoBuilder { inline flatbuffers::Offset CreateRoomMemberUpdateInfo( flatbuffers::FlatBufferBuilder &_fbb, flatbuffers::Offset roomMemberDataInternal = 0, - uint8_t eventCause = 0, + u8 eventCause = 0, flatbuffers::Offset optData = 0) { RoomMemberUpdateInfoBuilder builder_(_fbb); builder_.add_optData(optData); @@ -2450,8 +2450,8 @@ struct RoomUpdateInfo FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { VT_ERRORCODE = 6, VT_OPTDATA = 8 }; - uint8_t eventCause() const { - return GetField(VT_EVENTCAUSE, 0); + u8 eventCause() const { + return GetField(VT_EVENTCAUSE, 0); } int32_t errorCode() const { return GetField(VT_ERRORCODE, 0); @@ -2461,7 +2461,7 @@ struct RoomUpdateInfo FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { } bool Verify(flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && - VerifyField(verifier, VT_EVENTCAUSE) && + VerifyField(verifier, VT_EVENTCAUSE) && VerifyField(verifier, VT_ERRORCODE) && VerifyOffset(verifier, VT_OPTDATA) && verifier.VerifyTable(optData()) && @@ -2472,8 +2472,8 @@ struct RoomUpdateInfo FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { struct RoomUpdateInfoBuilder { flatbuffers::FlatBufferBuilder &fbb_; flatbuffers::uoffset_t start_; - void add_eventCause(uint8_t eventCause) { - fbb_.AddElement(RoomUpdateInfo::VT_EVENTCAUSE, eventCause, 0); + void add_eventCause(u8 eventCause) { + fbb_.AddElement(RoomUpdateInfo::VT_EVENTCAUSE, eventCause, 0); } void add_errorCode(int32_t errorCode) { fbb_.AddElement(RoomUpdateInfo::VT_ERRORCODE, errorCode, 0); @@ -2495,7 +2495,7 @@ struct RoomUpdateInfoBuilder { inline flatbuffers::Offset CreateRoomUpdateInfo( flatbuffers::FlatBufferBuilder &_fbb, - uint8_t eventCause = 0, + u8 eventCause = 0, int32_t errorCode = 0, flatbuffers::Offset optData = 0) { RoomUpdateInfoBuilder builder_(_fbb); @@ -2586,27 +2586,27 @@ struct SendRoomMessageRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Tab uint64_t roomId() const { return GetField(VT_ROOMID, 0); } - uint8_t castType() const { - return GetField(VT_CASTTYPE, 0); + u8 castType() const { + return GetField(VT_CASTTYPE, 0); } const flatbuffers::Vector *dst() const { return GetPointer *>(VT_DST); } - const flatbuffers::Vector *msg() const { - return GetPointer *>(VT_MSG); + const flatbuffers::Vector *msg() const { + return GetPointer *>(VT_MSG); } - uint8_t option() const { - return GetField(VT_OPTION, 0); + u8 option() const { + return GetField(VT_OPTION, 0); } bool Verify(flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && VerifyField(verifier, VT_ROOMID) && - VerifyField(verifier, VT_CASTTYPE) && + VerifyField(verifier, VT_CASTTYPE) && VerifyOffset(verifier, VT_DST) && verifier.VerifyVector(dst()) && VerifyOffset(verifier, VT_MSG) && verifier.VerifyVector(msg()) && - VerifyField(verifier, VT_OPTION) && + VerifyField(verifier, VT_OPTION) && verifier.EndTable(); } }; @@ -2617,17 +2617,17 @@ struct SendRoomMessageRequestBuilder { void add_roomId(uint64_t roomId) { fbb_.AddElement(SendRoomMessageRequest::VT_ROOMID, roomId, 0); } - void add_castType(uint8_t castType) { - fbb_.AddElement(SendRoomMessageRequest::VT_CASTTYPE, castType, 0); + void add_castType(u8 castType) { + fbb_.AddElement(SendRoomMessageRequest::VT_CASTTYPE, castType, 0); } void add_dst(flatbuffers::Offset> dst) { fbb_.AddOffset(SendRoomMessageRequest::VT_DST, dst); } - void add_msg(flatbuffers::Offset> msg) { + void add_msg(flatbuffers::Offset> msg) { fbb_.AddOffset(SendRoomMessageRequest::VT_MSG, msg); } - void add_option(uint8_t option) { - fbb_.AddElement(SendRoomMessageRequest::VT_OPTION, option, 0); + void add_option(u8 option) { + fbb_.AddElement(SendRoomMessageRequest::VT_OPTION, option, 0); } explicit SendRoomMessageRequestBuilder(flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { @@ -2644,10 +2644,10 @@ struct SendRoomMessageRequestBuilder { inline flatbuffers::Offset CreateSendRoomMessageRequest( flatbuffers::FlatBufferBuilder &_fbb, uint64_t roomId = 0, - uint8_t castType = 0, + u8 castType = 0, flatbuffers::Offset> dst = 0, - flatbuffers::Offset> msg = 0, - uint8_t option = 0) { + flatbuffers::Offset> msg = 0, + u8 option = 0) { SendRoomMessageRequestBuilder builder_(_fbb); builder_.add_roomId(roomId); builder_.add_msg(msg); @@ -2660,12 +2660,12 @@ inline flatbuffers::Offset CreateSendRoomMessageRequest( inline flatbuffers::Offset CreateSendRoomMessageRequestDirect( flatbuffers::FlatBufferBuilder &_fbb, uint64_t roomId = 0, - uint8_t castType = 0, + u8 castType = 0, const std::vector *dst = nullptr, - const std::vector *msg = nullptr, - uint8_t option = 0) { + const std::vector *msg = nullptr, + u8 option = 0) { auto dst__ = dst ? _fbb.CreateVector(*dst) : 0; - auto msg__ = msg ? _fbb.CreateVector(*msg) : 0; + auto msg__ = msg ? _fbb.CreateVector(*msg) : 0; return CreateSendRoomMessageRequest( _fbb, roomId, @@ -2684,10 +2684,10 @@ struct RoomMessageInfo FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { VT_MSG = 12 }; bool filtered() const { - return GetField(VT_FILTERED, 0) != 0; + return GetField(VT_FILTERED, 0) != 0; } - uint8_t castType() const { - return GetField(VT_CASTTYPE, 0); + u8 castType() const { + return GetField(VT_CASTTYPE, 0); } const flatbuffers::Vector *dst() const { return GetPointer *>(VT_DST); @@ -2695,13 +2695,13 @@ struct RoomMessageInfo FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { const UserInfo2 *srcMember() const { return GetPointer(VT_SRCMEMBER); } - const flatbuffers::Vector *msg() const { - return GetPointer *>(VT_MSG); + const flatbuffers::Vector *msg() const { + return GetPointer *>(VT_MSG); } bool Verify(flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && - VerifyField(verifier, VT_FILTERED) && - VerifyField(verifier, VT_CASTTYPE) && + VerifyField(verifier, VT_FILTERED) && + VerifyField(verifier, VT_CASTTYPE) && VerifyOffset(verifier, VT_DST) && verifier.VerifyVector(dst()) && VerifyOffset(verifier, VT_SRCMEMBER) && @@ -2716,10 +2716,10 @@ struct RoomMessageInfoBuilder { flatbuffers::FlatBufferBuilder &fbb_; flatbuffers::uoffset_t start_; void add_filtered(bool filtered) { - fbb_.AddElement(RoomMessageInfo::VT_FILTERED, static_cast(filtered), 0); + fbb_.AddElement(RoomMessageInfo::VT_FILTERED, static_cast(filtered), 0); } - void add_castType(uint8_t castType) { - fbb_.AddElement(RoomMessageInfo::VT_CASTTYPE, castType, 0); + void add_castType(u8 castType) { + fbb_.AddElement(RoomMessageInfo::VT_CASTTYPE, castType, 0); } void add_dst(flatbuffers::Offset> dst) { fbb_.AddOffset(RoomMessageInfo::VT_DST, dst); @@ -2727,7 +2727,7 @@ struct RoomMessageInfoBuilder { void add_srcMember(flatbuffers::Offset srcMember) { fbb_.AddOffset(RoomMessageInfo::VT_SRCMEMBER, srcMember); } - void add_msg(flatbuffers::Offset> msg) { + void add_msg(flatbuffers::Offset> msg) { fbb_.AddOffset(RoomMessageInfo::VT_MSG, msg); } explicit RoomMessageInfoBuilder(flatbuffers::FlatBufferBuilder &_fbb) @@ -2745,10 +2745,10 @@ struct RoomMessageInfoBuilder { inline flatbuffers::Offset CreateRoomMessageInfo( flatbuffers::FlatBufferBuilder &_fbb, bool filtered = false, - uint8_t castType = 0, + u8 castType = 0, flatbuffers::Offset> dst = 0, flatbuffers::Offset srcMember = 0, - flatbuffers::Offset> msg = 0) { + flatbuffers::Offset> msg = 0) { RoomMessageInfoBuilder builder_(_fbb); builder_.add_msg(msg); builder_.add_srcMember(srcMember); @@ -2761,12 +2761,12 @@ inline flatbuffers::Offset CreateRoomMessageInfo( inline flatbuffers::Offset CreateRoomMessageInfoDirect( flatbuffers::FlatBufferBuilder &_fbb, bool filtered = false, - uint8_t castType = 0, + u8 castType = 0, const std::vector *dst = nullptr, flatbuffers::Offset srcMember = 0, - const std::vector *msg = nullptr) { + const std::vector *msg = nullptr) { auto dst__ = dst ? _fbb.CreateVector(*dst) : 0; - auto msg__ = msg ? _fbb.CreateVector(*msg) : 0; + auto msg__ = msg ? _fbb.CreateVector(*msg) : 0; return CreateRoomMessageInfo( _fbb, filtered, diff --git a/rpcs3/Emu/NP/rpcn_client.cpp b/rpcs3/Emu/NP/rpcn_client.cpp index 7ac92a1d52..257abe0f58 100644 --- a/rpcs3/Emu/NP/rpcn_client.cpp +++ b/rpcs3/Emu/NP/rpcn_client.cpp @@ -659,7 +659,7 @@ bool rpcn_client::createjoin_room(u32 req_id, const SceNpCommunicationId& commun } final_binattrexternal_vec = builder.CreateVector(davec); } - flatbuffers::Offset> final_roompassword; + flatbuffers::Offset> final_roompassword; if (req->roomPassword) final_roompassword = builder.CreateVector(req->roomPassword->data, 8); flatbuffers::Offset>> final_groupconfigs_vec; @@ -695,7 +695,7 @@ bool rpcn_client::createjoin_room(u32 req_id, const SceNpCommunicationId& commun } final_blockedusers_vec = builder.CreateVector(davec); } - flatbuffers::Offset> final_grouplabel; + flatbuffers::Offset> final_grouplabel; if (req->joinRoomGroupLabel) final_grouplabel = builder.CreateVector(req->joinRoomGroupLabel->data, 8); flatbuffers::Offset>> final_memberbinattrinternal_vec; @@ -744,10 +744,10 @@ bool rpcn_client::join_room(u32 req_id, const SceNpCommunicationId& communicatio flatbuffers::FlatBufferBuilder builder(1024); - flatbuffers::Offset> final_roompassword; + flatbuffers::Offset> final_roompassword; if (req->roomPassword) final_roompassword = builder.CreateVector(req->roomPassword->data, 8); - flatbuffers::Offset> final_grouplabel; + flatbuffers::Offset> final_grouplabel; if (req->joinRoomGroupLabel) final_grouplabel = builder.CreateVector(req->joinRoomGroupLabel->data, 8); flatbuffers::Offset>> final_memberbinattrinternal_vec; diff --git a/rpcs3/Emu/RSX/rsx_utils.h b/rpcs3/Emu/RSX/rsx_utils.h index 815704eab8..73160cb952 100644 --- a/rpcs3/Emu/RSX/rsx_utils.h +++ b/rpcs3/Emu/RSX/rsx_utils.h @@ -29,7 +29,7 @@ namespace rsx using flags64_t = uint64_t; using flags32_t = uint32_t; using flags16_t = uint16_t; - using flags8_t = uint8_t; + using flags8_t = u8; extern atomic_t g_rsx_shared_tag;