BigfootDev/flatbuffers
1
0
Fork 1
mirror of https://github.com/google/flatbuffers.git synced 2026-06-10 07:06:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

[C++] Fix union type handling on object api in C++17 (#6745)

Browse Source
This commit is contained in:
Taiju Tsuiki
2021-07-25 18:20:34 +09:00
committed by GitHub
parent 12e341e4f8
commit 8be8a0a713
8 changed files with 872 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/evolution_test/evolution_v2_generated.h
View File

@@ -112,7 +112,7 @@ template<> struct UnionTraits<Evolution::V2::TableC> {
};
bool VerifyUnion(flatbuffers::Verifier &verifier, const void *obj, Union type);
bool VerifyUnionVector(flatbuffers::Verifier &verifier, const flatbuffers::Vector<flatbuffers::Offset<void>> *values, const flatbuffers::Vector<uint8_t> *types);
bool VerifyUnionVector(flatbuffers::Verifier &verifier, const flatbuffers::Vector<flatbuffers::Offset<void>> *values, const flatbuffers::Vector<Union> *types);
FLATBUFFERS_MANUALLY_ALIGNED_STRUCT(8) Struct FLATBUFFERS_FINAL_CLASS {
private:
@@ -552,7 +552,7 @@ inline bool VerifyUnion(flatbuffers::Verifier &verifier, const void *obj, Union
}
}
inline bool VerifyUnionVector(flatbuffers::Verifier &verifier, const flatbuffers::Vector<flatbuffers::Offset<void>> *values, const flatbuffers::Vector<uint8_t> *types) {
inline bool VerifyUnionVector(flatbuffers::Verifier &verifier, const flatbuffers::Vector<flatbuffers::Offset<void>> *values, const flatbuffers::Vector<Union> *types) {
if (!values || !types) return !values && !types;
if (values->size() != types->size()) return false;
for (flatbuffers::uoffset_t i = 0; i < values->size(); ++i) {