Commit 48081544 authored by Derek Bailey's avatar Derek Bailey Committed by Wouter van Oortmerssen

C++ verifier for evolved union fields should return true (#5586)

parent 8d5e424c
...@@ -655,7 +655,7 @@ inline bool VerifyEquipment(flatbuffers::Verifier &verifier, const void *obj, Eq ...@@ -655,7 +655,7 @@ inline bool VerifyEquipment(flatbuffers::Verifier &verifier, const void *obj, Eq
auto ptr = reinterpret_cast<const MyGame::Sample::Weapon *>(obj); auto ptr = reinterpret_cast<const MyGame::Sample::Weapon *>(obj);
return verifier.VerifyTable(ptr); return verifier.VerifyTable(ptr);
} }
default: return false; default: return true;
} }
} }
......
...@@ -1295,7 +1295,7 @@ class CppGenerator : public BaseGenerator { ...@@ -1295,7 +1295,7 @@ class CppGenerator : public BaseGenerator {
code_ += " }"; code_ += " }";
} }
} }
code_ += " default: return false;"; code_ += " default: return true;"; // unknown values are OK.
code_ += " }"; code_ += " }";
code_ += "}"; code_ += "}";
code_ += ""; code_ += "";
......
...@@ -2801,7 +2801,7 @@ inline bool VerifyAny(flatbuffers::Verifier &verifier, const void *obj, Any type ...@@ -2801,7 +2801,7 @@ inline bool VerifyAny(flatbuffers::Verifier &verifier, const void *obj, Any type
auto ptr = reinterpret_cast<const MyGame::Example2::Monster *>(obj); auto ptr = reinterpret_cast<const MyGame::Example2::Monster *>(obj);
return verifier.VerifyTable(ptr); return verifier.VerifyTable(ptr);
} }
default: return false; default: return true;
} }
} }
...@@ -2912,7 +2912,7 @@ inline bool VerifyAnyUniqueAliases(flatbuffers::Verifier &verifier, const void * ...@@ -2912,7 +2912,7 @@ inline bool VerifyAnyUniqueAliases(flatbuffers::Verifier &verifier, const void *
auto ptr = reinterpret_cast<const MyGame::Example2::Monster *>(obj); auto ptr = reinterpret_cast<const MyGame::Example2::Monster *>(obj);
return verifier.VerifyTable(ptr); return verifier.VerifyTable(ptr);
} }
default: return false; default: return true;
} }
} }
...@@ -3023,7 +3023,7 @@ inline bool VerifyAnyAmbiguousAliases(flatbuffers::Verifier &verifier, const voi ...@@ -3023,7 +3023,7 @@ inline bool VerifyAnyAmbiguousAliases(flatbuffers::Verifier &verifier, const voi
auto ptr = reinterpret_cast<const MyGame::Example::Monster *>(obj); auto ptr = reinterpret_cast<const MyGame::Example::Monster *>(obj);
return verifier.VerifyTable(ptr); return verifier.VerifyTable(ptr);
} }
default: return false; default: return true;
} }
} }
......
...@@ -563,7 +563,7 @@ inline bool VerifyCharacter(flatbuffers::Verifier &verifier, const void *obj, Ch ...@@ -563,7 +563,7 @@ inline bool VerifyCharacter(flatbuffers::Verifier &verifier, const void *obj, Ch
auto ptr = reinterpret_cast<const flatbuffers::String *>(obj); auto ptr = reinterpret_cast<const flatbuffers::String *>(obj);
return verifier.VerifyString(ptr); return verifier.VerifyString(ptr);
} }
default: return false; default: return true;
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment