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

Add namespace qualification to union types (#5666)

Browse Source
This commit is contained in:
cryptocode
2019-12-17 18:11:26 +01:00
committed by Wouter van Oortmerssen
parent eddebec1b6
commit 2790fee257
3 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/idl_gen_cpp.cpp
View File

@@ -693,7 +693,8 @@ class CppGenerator : public BaseGenerator {
}
}
case BASE_TYPE_UNION: {
return type.enum_def->name + "Union";
auto type_name = WrapInNameSpace(*type.enum_def);
return type_name + "Union";
}
default: {
return GenTypeBasic(type, true);
@@ -2259,7 +2260,8 @@ class CppGenerator : public BaseGenerator {
std::string GenUnionUnpackVal(const FieldDef &afield,
const char *vec_elem_access,
const char *vec_type_access) {
return afield.value.type.enum_def->name + "Union::UnPack(" + "_e" +
auto type_name = WrapInNameSpace(*afield.value.type.enum_def);
return type_name + "Union::UnPack(" + "_e" +
vec_elem_access + ", " +
EscapeKeyword(afield.name + UnionTypeFieldSuffix()) + "()" +
vec_type_access + ", _resolver)";