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

Fixed broken traits codegen for --scoped-enums.

Browse Source 
Change-Id: I5f538d12ea37d11d2e239ddde32eefcdd91e347b
Tested: on Linux.
This commit is contained in:
Wouter van Oortmerssen
2016-10-17 11:53:28 -07:00
parent 2beb985fcc
commit b5c622762b
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/idl_gen_cpp.cpp
View File

@@ -365,8 +365,8 @@ class CppGenerator : public BaseGenerator {
} }
static std::string GenEnumValDecl(const EnumDef &enum_def, static std::string GenEnumValDecl(const EnumDef &enum_def,
const std::string &enum_val, const std::string &enum_val,
const IDLOptions &opts) { const IDLOptions &opts) {
return opts.prefixed_enums ? enum_def.name + "_" + enum_val : enum_val; return opts.prefixed_enums ? enum_def.name + "_" + enum_val : enum_val;
} }
@@ -532,9 +532,11 @@ class CppGenerator : public BaseGenerator {
code += "template<typename T> struct " + enum_def.name + "Traits {\n"; code += "template<typename T> struct " + enum_def.name + "Traits {\n";
} }
else { else {
code += "template<> struct " + enum_def.name + "Traits<" + WrapInNameSpace(*ev.struct_def) + "> {\n"; code += "template<> struct " + enum_def.name + "Traits<" +
WrapInNameSpace(*ev.struct_def) + "> {\n";
} }
code += " static const " + enum_def.name + " enum_value = " + GenEnumValDecl(enum_def, ev.name, parser_.opts) + ";\n"; code += " static const " + enum_def.name + " enum_value = " +
GetEnumValUse(enum_def, ev, parser_.opts) + ";\n";
code += "};\n\n"; code += "};\n\n";
} }
} }