From nobody Sat May 14 22:41:00 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id AB2ED1ADF9DE; Sat, 14 May 2022 22:41:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4L10q04SvYz4r6H; Sat, 14 May 2022 22:41:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652568060; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=egE6xQg1mRA+vXEXWWDwXcoEEfQ48VGvzc8Fe4JgZjM=; b=WuSDSo3l4km9ERw+IW0cagpGbDKYfZfMhQsfnnb6yP0ymICG6h3uY6NY4wbhaoqynslTR3 8xKONsd7JNlQ+UCluVkUFQH01koG5DmcOA8KVVkVcDIidhfTUjZGDH/b7xE8Vf6odr6fVF PfTelkb9Pxdh8P/Ml1OMXQzYu698KVtS/rippG+wRRmOWMnar/Xd6mKRhIBEvZ+n7QBHHs WG/Hy3dnoxD6IaOcsPnoG9Yl3kU5ZpG7CE+LBgpc3kN31kWQYQwgDONJ96qPpq7uMYALXb MxuzbFwH7POedxUcmoW7jdJsnO9Jv6htHO7lULOG3AUk+JYGdrdvc7iW3XyfsA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7A1EA1FD8F; Sat, 14 May 2022 22:41:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 24EMf0pX002708; Sat, 14 May 2022 22:41:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24EMf0ro002707; Sat, 14 May 2022 22:41:00 GMT (envelope-from git) Date: Sat, 14 May 2022 22:41:00 GMT Message-Id: <202205142241.24EMf0ro002707@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 14f6379368f3 - main - emulators/rpcs3: drop flatbuffers workaround after 00e206324446 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 14f6379368f3403a2ef2788c513e00a948041fa5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652568060; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=egE6xQg1mRA+vXEXWWDwXcoEEfQ48VGvzc8Fe4JgZjM=; b=nlQouIKONc/ENchBepvlJaI3sH6FH7nEZ8GTSyuzf7ic87uWMeTy5Uk9XIJE4jJw1r8YbM CiY/PbJbamzmNPuQzgSaKeu/ZoTdCupiFFA0rPbuBs698j9yaqmqMd+Z3vU96EEbhwNwlA F8RoEV1bcgzWKK3pfWTPeuiz5Z3TU6VZ1mXCcMEUbYpPSxnA+/KTspPckTe753CwCaYMUu TLaNAyYDDQM3KVxkEoq1SflD/uXgin2Elc1B/LOcmp7ZY9xloGeKq3Il6zUt0jwRI6A50A b5z2MuLTv+T76qicJxtDSh4AwaFv942GkO89LkJoMRUyY8+d+Gwr8x0/KIn34w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652568060; a=rsa-sha256; cv=none; b=uLZwfpmCiI3mvSBZwnuVcE8nrNnJXFF1SMZOPJnAw2cJi9VrOC7jvm/ntqaZ4QXMy+8hF+ KLT7lyQFt/yQviSvFm+2Lovrcv6bfZJVjo2fO+Js5lsGSrKKrYrixUzS3Y5QHD3bt8TZhE aLU263VpnFfcMdDZRW52KLz5Pr/yWYClLk1ref9vbaJalqE8sSCBldQERMqYJS517ceXT8 IoRXeqW2xl26Nz/g0FMJtR3s5bAL+Ifrx7zACA7R3XpoEo8Q6hUA69JT5e3qWRcbuEdoU9 BCG37Bfrh+qvVD8znObusnLjarKoucgKhDRi3QtE2WuELrZyz5+ZKLonpzIQdQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=14f6379368f3403a2ef2788c513e00a948041fa5 commit 14f6379368f3403a2ef2788c513e00a948041fa5 Author: Jan Beich AuthorDate: 2022-05-14 22:15:07 +0000 Commit: Jan Beich CommitDate: 2022-05-14 22:40:50 +0000 emulators/rpcs3: drop flatbuffers workaround after 00e206324446 This reverts commit a8fe1f60e7a8c4377816d02eb7209a2a0c60f7ee. PR: 263552 --- emulators/rpcs3/Makefile | 4 +- emulators/rpcs3/files/patch-flatbuffers-2.0.5 | 531 -------------------------- 2 files changed, 2 insertions(+), 533 deletions(-) diff --git a/emulators/rpcs3/Makefile b/emulators/rpcs3/Makefile index b67e30d51c51..c0ae300b2218 100644 --- a/emulators/rpcs3/Makefile +++ b/emulators/rpcs3/Makefile @@ -1,8 +1,8 @@ PORTNAME= rpcs3 DISTVERSIONPREFIX= v DISTVERSION= 0.0.22-13597 # git rev-list --count HEAD -PORTREVISION= 1 DISTVERSIONSUFFIX= -g1e1b111678 +PORTREVISION= 2 CATEGORIES= emulators MAINTAINER= jbeich@FreeBSD.org @@ -13,7 +13,7 @@ LICENSE_COMB= multi LICENSE_FILE_ISCL= ${WRKSRC_cubeb}/LICENSE LICENSE_FILE_ZLIB= ${WRKSRC_asmjit}/LICENSE.md -BUILD_DEPENDS= flatc:devel/flatbuffers205 # until https://github.com/RPCS3/rpcs3/issues/12011 is fixed +BUILD_DEPENDS= flatbuffers>=2.0.6,1:devel/flatbuffers LIB_DEPENDS= libxxhash.so:devel/xxhash \ libcurl.so:ftp/curl \ libpng.so:graphics/png \ diff --git a/emulators/rpcs3/files/patch-flatbuffers-2.0.5 b/emulators/rpcs3/files/patch-flatbuffers-2.0.5 deleted file mode 100644 index b143b0c748f3..000000000000 --- a/emulators/rpcs3/files/patch-flatbuffers-2.0.5 +++ /dev/null @@ -1,531 +0,0 @@ -Revert https://github.com/RPCS3/rpcs3/commit/d02a8ba2b90b -until https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=263552 - -In file included from rpcs3/Emu/Cell/lv2/sys_net.cpp:34: -In file included from rpcs3/Emu/NP/np_handler.h:11: -In file included from rpcs3/Emu/NP/rpcn_client.h:29: -rpcs3/Emu/NP/generated/np2_structs_generated.h:128:12: error: no matching member function for call to 'VerifyField' - VerifyField(verifier, VT_ID, 2) && - ^~~~~~~~~~~~~~~~~~~~~ -rpcs3/Emu/NP/generated/np2_structs_generated.h:191:12: error: no matching member function for call to 'VerifyField' - VerifyField(verifier, VT_ID, 2) && - ^~~~~~~~~~~~~~~~~~~~~ -rpcs3/Emu/NP/generated/np2_structs_generated.h:192:12: error: no matching member function for call to 'VerifyField' - VerifyField(verifier, VT_NUM, 4) && - ^~~~~~~~~~~~~~~~~~~~~ -rpcs3/Emu/NP/generated/np2_structs_generated.h:242:12: error: no matching member function for call to 'VerifyField' - VerifyField(verifier, VT_UPDATEDATE, 8) && - ^~~~~~~~~~~~~~~~~~~~~ -rpcs3/Emu/NP/generated/np2_structs_generated.h:298:12: error: no matching member function for call to 'VerifyField' - VerifyField(verifier, VT_UPDATEDATE, 8) && - ^~~~~~~~~~~~~~~~~~~~~ -rpcs3/Emu/NP/generated/np2_structs_generated.h:299:12: error: no matching member function for call to 'VerifyField' - VerifyField(verifier, VT_UPDATEMEMBERID, 2) && - ^~~~~~~~~~~~~~~~~~~~~ -rpcs3/Emu/NP/generated/np2_structs_generated.h:360:12: error: no matching member function for call to 'VerifyField' - VerifyField(verifier, VT_TYPE, 1) && - ^~~~~~~~~~~~~~~~~~~~ -rpcs3/Emu/NP/generated/np2_structs_generated.h:361:12: error: no matching member function for call to 'VerifyField' - VerifyField(verifier, VT_FLAG, 1) && - ^~~~~~~~~~~~~~~~~~~~ -rpcs3/Emu/NP/generated/np2_structs_generated.h:362:12: error: no matching member function for call to 'VerifyField' - VerifyField(verifier, VT_HUBMEMBERID, 2) && - ^~~~~~~~~~~~~~~~~~~~~ -rpcs3/Emu/NP/generated/np2_structs_generated.h:425:12: error: no matching member function for call to 'VerifyField' - VerifyField(verifier, VT_SLOTNUM, 4) && - ^~~~~~~~~~~~~~~~~~~~~ -rpcs3/Emu/NP/generated/np2_structs_generated.h:426:12: error: no matching member function for call to 'VerifyField' - VerifyField(verifier, VT_WITHLABEL, 1) && - ^~~~~~~~~~~~~~~~~~~~ -rpcs3/Emu/NP/generated/np2_structs_generated.h:429:12: error: no matching member function for call to 'VerifyField' - VerifyField(verifier, VT_WITHPASSWORD, 1) && - ^~~~~~~~~~~~~~~~~~~~ -rpcs3/Emu/NP/generated/np2_structs_generated.h:609:12: error: no matching member function for call to 'VerifyField' - VerifyField(verifier, VT_JOINDATE, 8) && - ^~~~~~~~~~~~~~~~~~~~~ -rpcs3/Emu/NP/generated/np2_structs_generated.h:610:12: error: no matching member function for call to 'VerifyField' - VerifyField(verifier, VT_MEMBERID, 2) && - ^~~~~~~~~~~~~~~~~~~~~ -rpcs3/Emu/NP/generated/np2_structs_generated.h:611:12: error: no matching member function for call to 'VerifyField' - VerifyField(verifier, VT_TEAMID, 1) && - ^~~~~~~~~~~~~~~~~~~~ -rpcs3/Emu/NP/generated/np2_structs_generated.h:614:12: error: no matching member function for call to 'VerifyField' - VerifyField(verifier, VT_NATTYPE, 1) && - ^~~~~~~~~~~~~~~~~~~~ -rpcs3/Emu/NP/generated/np2_structs_generated.h:615:12: error: no matching member function for call to 'VerifyField' - VerifyField(verifier, VT_FLAGATTR, 4) && - ^~~~~~~~~~~~~~~~~~~~~ -rpcs3/Emu/NP/generated/np2_structs_generated.h:737:12: error: no matching member function for call to 'VerifyField' - VerifyField(verifier, VT_GROUPID, 1) && - ^~~~~~~~~~~~~~~~~~~~ -rpcs3/Emu/NP/generated/np2_structs_generated.h:738:12: error: no matching member function for call to 'VerifyField' - VerifyField(verifier, VT_WITHPASSWORD, 1) && - ^~~~~~~~~~~~~~~~~~~~ -/usr/local/include/flatbuffers/table.h:115:8: note: candidate function template not viable: requires 2 arguments, but 3 were provided - bool VerifyField(const Verifier &verifier, voffset_t field) const { - ^ -fatal error: too many errors emitted, stopping now [-ferror-limit=] - ---- rpcs3/Emu/NP/generated/np2_structs_generated.h.orig 2022-04-24 18:18:36 UTC -+++ rpcs3/Emu/NP/generated/np2_structs_generated.h -@@ -125,7 +125,7 @@ struct BinAttr FLATBUFFERS_FINAL_CLASS : private flatb - } - bool Verify(flatbuffers::Verifier &verifier) const { - return VerifyTableStart(verifier) && -- VerifyField(verifier, VT_ID, 2) && -+ VerifyField(verifier, VT_ID) && - VerifyOffset(verifier, VT_DATA) && - verifier.VerifyVector(data()) && - verifier.EndTable(); -@@ -188,8 +188,8 @@ struct IntAttr FLATBUFFERS_FINAL_CLASS : private flatb - } - bool Verify(flatbuffers::Verifier &verifier) const { - return VerifyTableStart(verifier) && -- VerifyField(verifier, VT_ID, 2) && -- VerifyField(verifier, VT_NUM, 4) && -+ VerifyField(verifier, VT_ID) && -+ VerifyField(verifier, VT_NUM) && - verifier.EndTable(); - } - }; -@@ -239,7 +239,7 @@ struct RoomMemberBinAttrInternal FLATBUFFERS_FINAL_CLA - } - bool Verify(flatbuffers::Verifier &verifier) const { - return VerifyTableStart(verifier) && -- VerifyField(verifier, VT_UPDATEDATE, 8) && -+ VerifyField(verifier, VT_UPDATEDATE) && - VerifyOffset(verifier, VT_DATA) && - verifier.VerifyTable(data()) && - verifier.EndTable(); -@@ -295,8 +295,8 @@ struct BinAttrInternal FLATBUFFERS_FINAL_CLASS : priva - } - bool Verify(flatbuffers::Verifier &verifier) const { - return VerifyTableStart(verifier) && -- VerifyField(verifier, VT_UPDATEDATE, 8) && -- VerifyField(verifier, VT_UPDATEMEMBERID, 2) && -+ VerifyField(verifier, VT_UPDATEDATE) && -+ VerifyField(verifier, VT_UPDATEMEMBERID) && - VerifyOffset(verifier, VT_DATA) && - verifier.VerifyTable(data()) && - verifier.EndTable(); -@@ -357,9 +357,9 @@ struct OptParam FLATBUFFERS_FINAL_CLASS : private flat - } - bool Verify(flatbuffers::Verifier &verifier) const { - return VerifyTableStart(verifier) && -- VerifyField(verifier, VT_TYPE, 1) && -- VerifyField(verifier, VT_FLAG, 1) && -- VerifyField(verifier, VT_HUBMEMBERID, 2) && -+ VerifyField(verifier, VT_TYPE) && -+ VerifyField(verifier, VT_FLAG) && -+ VerifyField(verifier, VT_HUBMEMBERID) && - verifier.EndTable(); - } - }; -@@ -422,11 +422,11 @@ struct GroupConfig FLATBUFFERS_FINAL_CLASS : private f - } - bool Verify(flatbuffers::Verifier &verifier) const { - return VerifyTableStart(verifier) && -- VerifyField(verifier, VT_SLOTNUM, 4) && -- VerifyField(verifier, VT_WITHLABEL, 1) && -+ VerifyField(verifier, VT_SLOTNUM) && -+ VerifyField(verifier, VT_WITHLABEL) && - VerifyOffset(verifier, VT_LABEL) && - verifier.VerifyVector(label()) && -- VerifyField(verifier, VT_WITHPASSWORD, 1) && -+ VerifyField(verifier, VT_WITHPASSWORD) && - verifier.EndTable(); - } - }; -@@ -606,13 +606,13 @@ struct RoomMemberDataInternal FLATBUFFERS_FINAL_CLASS - return VerifyTableStart(verifier) && - VerifyOffset(verifier, VT_USERINFO) && - verifier.VerifyTable(userInfo()) && -- VerifyField(verifier, VT_JOINDATE, 8) && -- VerifyField(verifier, VT_MEMBERID, 2) && -- VerifyField(verifier, VT_TEAMID, 1) && -+ VerifyField(verifier, VT_JOINDATE) && -+ VerifyField(verifier, VT_MEMBERID) && -+ VerifyField(verifier, VT_TEAMID) && - VerifyOffset(verifier, VT_ROOMGROUP) && - verifier.VerifyTable(roomGroup()) && -- VerifyField(verifier, VT_NATTYPE, 1) && -- VerifyField(verifier, VT_FLAGATTR, 4) && -+ VerifyField(verifier, VT_NATTYPE) && -+ VerifyField(verifier, VT_FLAGATTR) && - VerifyOffset(verifier, VT_ROOMMEMBERBINATTRINTERNAL) && - verifier.VerifyVector(roomMemberBinAttrInternal()) && - verifier.VerifyVectorOfTables(roomMemberBinAttrInternal()) && -@@ -734,13 +734,13 @@ struct RoomGroup FLATBUFFERS_FINAL_CLASS : private fla - } - bool Verify(flatbuffers::Verifier &verifier) const { - return VerifyTableStart(verifier) && -- VerifyField(verifier, VT_GROUPID, 1) && -- VerifyField(verifier, VT_WITHPASSWORD, 1) && -- VerifyField(verifier, VT_WITHLABEL, 1) && -+ VerifyField(verifier, VT_GROUPID) && -+ VerifyField(verifier, VT_WITHPASSWORD) && -+ VerifyField(verifier, VT_WITHLABEL) && - VerifyOffset(verifier, VT_LABEL) && - verifier.VerifyVector(label()) && -- VerifyField(verifier, VT_SLOTNUM, 4) && -- VerifyField(verifier, VT_CURGROUPMEMBERNUM, 4) && -+ VerifyField(verifier, VT_SLOTNUM) && -+ VerifyField(verifier, VT_CURGROUPMEMBERNUM) && - verifier.EndTable(); - } - }; -@@ -865,20 +865,20 @@ struct RoomDataInternal FLATBUFFERS_FINAL_CLASS : priv - } - bool Verify(flatbuffers::Verifier &verifier) const { - return VerifyTableStart(verifier) && -- VerifyField(verifier, VT_SERVERID, 2) && -- VerifyField(verifier, VT_WORLDID, 4) && -- VerifyField(verifier, VT_LOBBYID, 8) && -- VerifyField(verifier, VT_ROOMID, 8) && -- VerifyField(verifier, VT_PASSWORDSLOTMASK, 8) && -- VerifyField(verifier, VT_MAXSLOT, 4) && -+ VerifyField(verifier, VT_SERVERID) && -+ VerifyField(verifier, VT_WORLDID) && -+ VerifyField(verifier, VT_LOBBYID) && -+ VerifyField(verifier, VT_ROOMID) && -+ VerifyField(verifier, VT_PASSWORDSLOTMASK) && -+ VerifyField(verifier, VT_MAXSLOT) && - VerifyOffset(verifier, VT_MEMBERLIST) && - verifier.VerifyVector(memberList()) && - verifier.VerifyVectorOfTables(memberList()) && -- VerifyField(verifier, VT_OWNERID, 2) && -+ VerifyField(verifier, VT_OWNERID) && - VerifyOffset(verifier, VT_ROOMGROUP) && - verifier.VerifyVector(roomGroup()) && - verifier.VerifyVectorOfTables(roomGroup()) && -- VerifyField(verifier, VT_FLAGATTR, 4) && -+ VerifyField(verifier, VT_FLAGATTR) && - VerifyOffset(verifier, VT_ROOMBINATTRINTERNAL) && - verifier.VerifyVector(roomBinAttrInternal()) && - verifier.VerifyVectorOfTables(roomBinAttrInternal()) && -@@ -1067,23 +1067,23 @@ struct RoomDataExternal FLATBUFFERS_FINAL_CLASS : priv - } - bool Verify(flatbuffers::Verifier &verifier) const { - return VerifyTableStart(verifier) && -- VerifyField(verifier, VT_SERVERID, 2) && -- VerifyField(verifier, VT_WORLDID, 4) && -- VerifyField(verifier, VT_PUBLICSLOTNUM, 2) && -- VerifyField(verifier, VT_PRIVATESLOTNUM, 2) && -- VerifyField(verifier, VT_LOBBYID, 8) && -- VerifyField(verifier, VT_ROOMID, 8) && -- VerifyField(verifier, VT_OPENPUBLICSLOTNUM, 2) && -- VerifyField(verifier, VT_MAXSLOT, 2) && -- VerifyField(verifier, VT_OPENPRIVATESLOTNUM, 2) && -- VerifyField(verifier, VT_CURMEMBERNUM, 2) && -- VerifyField(verifier, VT_PASSWORDSLOTMASK, 8) && -+ VerifyField(verifier, VT_SERVERID) && -+ VerifyField(verifier, VT_WORLDID) && -+ VerifyField(verifier, VT_PUBLICSLOTNUM) && -+ VerifyField(verifier, VT_PRIVATESLOTNUM) && -+ VerifyField(verifier, VT_LOBBYID) && -+ VerifyField(verifier, VT_ROOMID) && -+ VerifyField(verifier, VT_OPENPUBLICSLOTNUM) && -+ VerifyField(verifier, VT_MAXSLOT) && -+ VerifyField(verifier, VT_OPENPRIVATESLOTNUM) && -+ VerifyField(verifier, VT_CURMEMBERNUM) && -+ VerifyField(verifier, VT_PASSWORDSLOTMASK) && - VerifyOffset(verifier, VT_OWNER) && - verifier.VerifyTable(owner()) && - VerifyOffset(verifier, VT_ROOMGROUP) && - verifier.VerifyVector(roomGroup()) && - verifier.VerifyVectorOfTables(roomGroup()) && -- VerifyField(verifier, VT_FLAGATTR, 4) && -+ VerifyField(verifier, VT_FLAGATTR) && - VerifyOffset(verifier, VT_ROOMSEARCHABLEINTATTREXTERNAL) && - verifier.VerifyVector(roomSearchableIntAttrExternal()) && - verifier.VerifyVectorOfTables(roomSearchableIntAttrExternal()) && -@@ -1261,7 +1261,7 @@ struct IntSearchFilter FLATBUFFERS_FINAL_CLASS : priva - } - bool Verify(flatbuffers::Verifier &verifier) const { - return VerifyTableStart(verifier) && -- VerifyField(verifier, VT_SEARCHOPERATOR, 1) && -+ VerifyField(verifier, VT_SEARCHOPERATOR) && - VerifyOffset(verifier, VT_ATTR) && - verifier.VerifyTable(attr()) && - verifier.EndTable(); -@@ -1313,7 +1313,7 @@ struct BinSearchFilter FLATBUFFERS_FINAL_CLASS : priva - } - bool Verify(flatbuffers::Verifier &verifier) const { - return VerifyTableStart(verifier) && -- VerifyField(verifier, VT_SEARCHOPERATOR, 1) && -+ VerifyField(verifier, VT_SEARCHOPERATOR) && - VerifyOffset(verifier, VT_ATTR) && - verifier.VerifyTable(attr()) && - verifier.EndTable(); -@@ -1367,7 +1367,7 @@ struct PresenceOptionData FLATBUFFERS_FINAL_CLASS : pr - return VerifyTableStart(verifier) && - VerifyOffset(verifier, VT_DATA) && - verifier.VerifyVector(data()) && -- VerifyField(verifier, VT_LEN, 4) && -+ VerifyField(verifier, VT_LEN) && - verifier.EndTable(); - } - }; -@@ -1430,7 +1430,7 @@ struct RoomGroupPasswordConfig FLATBUFFERS_FINAL_CLASS - return VerifyTableStart(verifier) && - VerifyOffset(verifier, VT_GROUPID) && - verifier.VerifyVector(groupId()) && -- VerifyField(verifier, VT_WITHPASSWORD, 1) && -+ VerifyField(verifier, VT_WITHPASSWORD) && - verifier.EndTable(); - } - }; -@@ -1523,13 +1523,13 @@ struct SearchRoomRequest FLATBUFFERS_FINAL_CLASS : pri - } - bool Verify(flatbuffers::Verifier &verifier) const { - return VerifyTableStart(verifier) && -- VerifyField(verifier, VT_OPTION, 4) && -- VerifyField(verifier, VT_WORLDID, 4) && -- VerifyField(verifier, VT_LOBBYID, 8) && -- VerifyField(verifier, VT_RANGEFILTER_STARTINDEX, 4) && -- VerifyField(verifier, VT_RANGEFILTER_MAX, 4) && -- VerifyField(verifier, VT_FLAGFILTER, 4) && -- VerifyField(verifier, VT_FLAGATTR, 4) && -+ VerifyField(verifier, VT_OPTION) && -+ VerifyField(verifier, VT_WORLDID) && -+ VerifyField(verifier, VT_LOBBYID) && -+ VerifyField(verifier, VT_RANGEFILTER_STARTINDEX) && -+ VerifyField(verifier, VT_RANGEFILTER_MAX) && -+ VerifyField(verifier, VT_FLAGFILTER) && -+ VerifyField(verifier, VT_FLAGATTR) && - VerifyOffset(verifier, VT_INTFILTER) && - verifier.VerifyVector(intFilter()) && - verifier.VerifyVectorOfTables(intFilter()) && -@@ -1664,9 +1664,9 @@ struct SearchRoomResponse FLATBUFFERS_FINAL_CLASS : pr - } - bool Verify(flatbuffers::Verifier &verifier) const { - return VerifyTableStart(verifier) && -- VerifyField(verifier, VT_STARTINDEX, 4) && -- VerifyField(verifier, VT_TOTAL, 4) && -- VerifyField(verifier, VT_SIZE, 4) && -+ VerifyField(verifier, VT_STARTINDEX) && -+ VerifyField(verifier, VT_TOTAL) && -+ VerifyField(verifier, VT_SIZE) && - VerifyOffset(verifier, VT_ROOMS) && - verifier.VerifyVector(rooms()) && - verifier.VerifyVectorOfTables(rooms()) && -@@ -1804,10 +1804,10 @@ struct CreateJoinRoomRequest FLATBUFFERS_FINAL_CLASS : - } - bool Verify(flatbuffers::Verifier &verifier) const { - return VerifyTableStart(verifier) && -- VerifyField(verifier, VT_WORLDID, 4) && -- VerifyField(verifier, VT_LOBBYID, 8) && -- VerifyField(verifier, VT_MAXSLOT, 4) && -- VerifyField(verifier, VT_FLAGATTR, 4) && -+ VerifyField(verifier, VT_WORLDID) && -+ VerifyField(verifier, VT_LOBBYID) && -+ VerifyField(verifier, VT_MAXSLOT) && -+ VerifyField(verifier, VT_FLAGATTR) && - VerifyOffset(verifier, VT_ROOMBINATTRINTERNAL) && - verifier.VerifyVector(roomBinAttrInternal()) && - verifier.VerifyVectorOfTables(roomBinAttrInternal()) && -@@ -1825,7 +1825,7 @@ struct CreateJoinRoomRequest FLATBUFFERS_FINAL_CLASS : - VerifyOffset(verifier, VT_GROUPCONFIG) && - verifier.VerifyVector(groupConfig()) && - verifier.VerifyVectorOfTables(groupConfig()) && -- VerifyField(verifier, VT_PASSWORDSLOTMASK, 8) && -+ VerifyField(verifier, VT_PASSWORDSLOTMASK) && - VerifyOffset(verifier, VT_ALLOWEDUSER) && - verifier.VerifyVector(allowedUser()) && - verifier.VerifyVectorOfStrings(allowedUser()) && -@@ -1837,7 +1837,7 @@ struct CreateJoinRoomRequest FLATBUFFERS_FINAL_CLASS : - VerifyOffset(verifier, VT_ROOMMEMBERBINATTRINTERNAL) && - verifier.VerifyVector(roomMemberBinAttrInternal()) && - verifier.VerifyVectorOfTables(roomMemberBinAttrInternal()) && -- VerifyField(verifier, VT_TEAMID, 1) && -+ VerifyField(verifier, VT_TEAMID) && - VerifyOffset(verifier, VT_SIGOPTPARAM) && - verifier.VerifyTable(sigOptParam()) && - verifier.EndTable(); -@@ -2030,7 +2030,7 @@ struct JoinRoomRequest FLATBUFFERS_FINAL_CLASS : priva - } - bool Verify(flatbuffers::Verifier &verifier) const { - return VerifyTableStart(verifier) && -- VerifyField(verifier, VT_ROOMID, 8) && -+ VerifyField(verifier, VT_ROOMID) && - VerifyOffset(verifier, VT_ROOMPASSWORD) && - verifier.VerifyVector(roomPassword()) && - VerifyOffset(verifier, VT_JOINROOMGROUPLABEL) && -@@ -2040,7 +2040,7 @@ struct JoinRoomRequest FLATBUFFERS_FINAL_CLASS : priva - verifier.VerifyVectorOfTables(roomMemberBinAttrInternal()) && - VerifyOffset(verifier, VT_OPTDATA) && - verifier.VerifyTable(optData()) && -- VerifyField(verifier, VT_TEAMID, 1) && -+ VerifyField(verifier, VT_TEAMID) && - verifier.EndTable(); - } - }; -@@ -2131,7 +2131,7 @@ struct LeaveRoomRequest FLATBUFFERS_FINAL_CLASS : priv - } - bool Verify(flatbuffers::Verifier &verifier) const { - return VerifyTableStart(verifier) && -- VerifyField(verifier, VT_ROOMID, 8) && -+ VerifyField(verifier, VT_ROOMID) && - VerifyOffset(verifier, VT_OPTDATA) && - verifier.VerifyTable(optData()) && - verifier.EndTable(); -@@ -2308,7 +2308,7 @@ struct SetRoomDataExternalRequest FLATBUFFERS_FINAL_CL - } - bool Verify(flatbuffers::Verifier &verifier) const { - return VerifyTableStart(verifier) && -- VerifyField(verifier, VT_ROOMID, 8) && -+ VerifyField(verifier, VT_ROOMID) && - VerifyOffset(verifier, VT_ROOMSEARCHABLEINTATTREXTERNAL) && - verifier.VerifyVector(roomSearchableIntAttrExternal()) && - verifier.VerifyVectorOfTables(roomSearchableIntAttrExternal()) && -@@ -2414,16 +2414,16 @@ struct SetRoomDataInternalRequest FLATBUFFERS_FINAL_CL - } - bool Verify(flatbuffers::Verifier &verifier) const { - return VerifyTableStart(verifier) && -- VerifyField(verifier, VT_ROOMID, 8) && -- VerifyField(verifier, VT_FLAGFILTER, 4) && -- VerifyField(verifier, VT_FLAGATTR, 4) && -+ VerifyField(verifier, VT_ROOMID) && -+ VerifyField(verifier, VT_FLAGFILTER) && -+ VerifyField(verifier, VT_FLAGATTR) && - VerifyOffset(verifier, VT_ROOMBINATTRINTERNAL) && - verifier.VerifyVector(roomBinAttrInternal()) && - verifier.VerifyVectorOfTables(roomBinAttrInternal()) && - VerifyOffset(verifier, VT_PASSWORDCONFIG) && - verifier.VerifyVector(passwordConfig()) && - verifier.VerifyVectorOfTables(passwordConfig()) && -- VerifyField(verifier, VT_PASSWORDSLOTMASK, 8) && -+ VerifyField(verifier, VT_PASSWORDSLOTMASK) && - VerifyOffset(verifier, VT_OWNERPRIVILEGERANK) && - verifier.VerifyVector(ownerPrivilegeRank()) && - verifier.EndTable(); -@@ -2531,9 +2531,9 @@ struct SetRoomMemberDataInternalRequest FLATBUFFERS_FI - } - bool Verify(flatbuffers::Verifier &verifier) const { - return VerifyTableStart(verifier) && -- VerifyField(verifier, VT_ROOMID, 8) && -- VerifyField(verifier, VT_MEMBERID, 2) && -- VerifyField(verifier, VT_TEAMID, 1) && -+ VerifyField(verifier, VT_ROOMID) && -+ VerifyField(verifier, VT_MEMBERID) && -+ VerifyField(verifier, VT_TEAMID) && - VerifyOffset(verifier, VT_ROOMMEMBERBINATTRINTERNAL) && - verifier.VerifyVector(roomMemberBinAttrInternal()) && - verifier.VerifyVectorOfTables(roomMemberBinAttrInternal()) && -@@ -2611,7 +2611,7 @@ struct GetRoomDataInternalRequest FLATBUFFERS_FINAL_CL - } - bool Verify(flatbuffers::Verifier &verifier) const { - return VerifyTableStart(verifier) && -- VerifyField(verifier, VT_ROOMID, 8) && -+ VerifyField(verifier, VT_ROOMID) && - VerifyOffset(verifier, VT_ATTRID) && - verifier.VerifyVector(attrId()) && - verifier.EndTable(); -@@ -2680,7 +2680,7 @@ struct RoomMemberUpdateInfo FLATBUFFERS_FINAL_CLASS : - return VerifyTableStart(verifier) && - VerifyOffset(verifier, VT_ROOMMEMBERDATAINTERNAL) && - verifier.VerifyTable(roomMemberDataInternal()) && -- VerifyField(verifier, VT_EVENTCAUSE, 1) && -+ VerifyField(verifier, VT_EVENTCAUSE) && - VerifyOffset(verifier, VT_OPTDATA) && - verifier.VerifyTable(optData()) && - verifier.EndTable(); -@@ -2741,8 +2741,8 @@ struct RoomUpdateInfo FLATBUFFERS_FINAL_CLASS : privat - } - bool Verify(flatbuffers::Verifier &verifier) const { - return VerifyTableStart(verifier) && -- VerifyField(verifier, VT_EVENTCAUSE, 1) && -- VerifyField(verifier, VT_ERRORCODE, 4) && -+ VerifyField(verifier, VT_EVENTCAUSE) && -+ VerifyField(verifier, VT_ERRORCODE) && - VerifyOffset(verifier, VT_OPTDATA) && - verifier.VerifyTable(optData()) && - verifier.EndTable(); -@@ -2813,8 +2813,8 @@ struct RoomDataInternalUpdateInfo FLATBUFFERS_FINAL_CL - return VerifyTableStart(verifier) && - VerifyOffset(verifier, VT_NEWROOMDATAINTERNAL) && - verifier.VerifyTable(newRoomDataInternal()) && -- VerifyField(verifier, VT_PREVFLAGATTR, 4) && -- VerifyField(verifier, VT_PREVROOMPASSWORDSLOTMASK, 8) && -+ VerifyField(verifier, VT_PREVFLAGATTR) && -+ VerifyField(verifier, VT_PREVROOMPASSWORDSLOTMASK) && - VerifyOffset(verifier, VT_NEWROOMGROUP) && - verifier.VerifyVector(newRoomGroup()) && - VerifyOffset(verifier, VT_NEWROOMBINATTRINTERNAL) && -@@ -2911,8 +2911,8 @@ struct RoomMemberDataInternalUpdateInfo FLATBUFFERS_FI - return VerifyTableStart(verifier) && - VerifyOffset(verifier, VT_NEWROOMMEMBERDATAINTERNAL) && - verifier.VerifyTable(newRoomMemberDataInternal()) && -- VerifyField(verifier, VT_PREVFLAGATTR, 4) && -- VerifyField(verifier, VT_PREVTEAMID, 1) && -+ VerifyField(verifier, VT_PREVFLAGATTR) && -+ VerifyField(verifier, VT_PREVTEAMID) && - VerifyOffset(verifier, VT_NEWROOMMEMBERBINATTRINTERNAL) && - verifier.VerifyVector(newRoomMemberBinAttrInternal()) && - verifier.EndTable(); -@@ -2997,10 +2997,10 @@ struct GetPingInfoResponse FLATBUFFERS_FINAL_CLASS : p - } - bool Verify(flatbuffers::Verifier &verifier) const { - return VerifyTableStart(verifier) && -- VerifyField(verifier, VT_SERVERID, 2) && -- VerifyField(verifier, VT_WORLDID, 4) && -- VerifyField(verifier, VT_ROOMID, 8) && -- VerifyField(verifier, VT_RTT, 4) && -+ VerifyField(verifier, VT_SERVERID) && -+ VerifyField(verifier, VT_WORLDID) && -+ VerifyField(verifier, VT_ROOMID) && -+ VerifyField(verifier, VT_RTT) && - verifier.EndTable(); - } - }; -@@ -3072,13 +3072,13 @@ struct SendRoomMessageRequest FLATBUFFERS_FINAL_CLASS - } - bool Verify(flatbuffers::Verifier &verifier) const { - return VerifyTableStart(verifier) && -- VerifyField(verifier, VT_ROOMID, 8) && -- VerifyField(verifier, VT_CASTTYPE, 1) && -+ VerifyField(verifier, VT_ROOMID) && -+ VerifyField(verifier, VT_CASTTYPE) && - VerifyOffset(verifier, VT_DST) && - verifier.VerifyVector(dst()) && - VerifyOffset(verifier, VT_MSG) && - verifier.VerifyVector(msg()) && -- VerifyField(verifier, VT_OPTION, 1) && -+ VerifyField(verifier, VT_OPTION) && - verifier.EndTable(); - } - }; -@@ -3173,8 +3173,8 @@ struct RoomMessageInfo FLATBUFFERS_FINAL_CLASS : priva - } - bool Verify(flatbuffers::Verifier &verifier) const { - return VerifyTableStart(verifier) && -- VerifyField(verifier, VT_FILTERED, 1) && -- VerifyField(verifier, VT_CASTTYPE, 1) && -+ VerifyField(verifier, VT_FILTERED) && -+ VerifyField(verifier, VT_CASTTYPE) && - VerifyOffset(verifier, VT_DST) && - verifier.VerifyVector(dst()) && - VerifyOffset(verifier, VT_SRCMEMBER) && -@@ -3289,10 +3289,10 @@ struct MessageDetails FLATBUFFERS_FINAL_CLASS : privat - return VerifyTableStart(verifier) && - VerifyOffset(verifier, VT_COMMUNICATIONID) && - verifier.VerifyString(communicationId()) && -- VerifyField(verifier, VT_MSGID, 8) && -- VerifyField(verifier, VT_MAINTYPE, 2) && -- VerifyField(verifier, VT_SUBTYPE, 2) && -- VerifyField(verifier, VT_MSGFEATURES, 4) && -+ VerifyField(verifier, VT_MSGID) && -+ VerifyField(verifier, VT_MAINTYPE) && -+ VerifyField(verifier, VT_SUBTYPE) && -+ VerifyField(verifier, VT_MSGFEATURES) && - VerifyOffset(verifier, VT_SUBJECT) && - verifier.VerifyString(subject()) && - VerifyOffset(verifier, VT_BODY) && -@@ -3409,7 +3409,6 @@ struct SendMessageRequest FLATBUFFERS_FINAL_CLASS : pr - return VerifyTableStart(verifier) && - VerifyOffset(verifier, VT_MESSAGE) && - verifier.VerifyVector(message()) && -- verifier.VerifyNestedFlatBuffer(message(), nullptr) && - VerifyOffset(verifier, VT_NPIDS) && - verifier.VerifyVector(npids()) && - verifier.VerifyVectorOfStrings(npids()) &&