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

[C++] Fix compile failure on Object API union construction for struct member (#6923)

Browse Source 
* Add dedicated traits to Object API version of unions.

* Add suppression for unused parameters on unions of structs.
This commit is contained in:
Taiju Tsuiki
2021-11-19 03:55:11 +09:00
committed by GitHub
parent a9c341545f
commit 587bbd49a7
29 changed files with 1990 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/idl_gen_cpp.cpp
View File

@@ -1311,11 +1311,30 @@ class CppGenerator : public BaseGenerator {
}
if (opts_.generate_object_based_api && enum_def.is_union) {
// Generate a union type
// Generate a union type and a trait type for it.
code_.SetValue("NAME", Name(enum_def));
FLATBUFFERS_ASSERT(enum_def.Lookup("NONE"));
code_.SetValue("NONE", GetEnumValUse(enum_def, *enum_def.Lookup("NONE")));
if (!enum_def.uses_multiple_type_instances) {
for (auto it = enum_def.Vals().begin(); it != enum_def.Vals().end();
++it) {
const auto &ev = **it;
if (it == enum_def.Vals().begin()) {
code_ += "template<typename T> struct {{NAME}}UnionTraits {";
} else {
auto name = GetUnionElement(ev, true, opts_);
code_ += "template<> struct {{NAME}}UnionTraits<" + name + "> {";
}
auto value = GetEnumValUse(enum_def, ev);
code_ += " static const {{ENUM_NAME}} enum_value = " + value + ";";
code_ += "};";
code_ += "";
}
}
code_ += "struct {{NAME}}Union {";
code_ += " {{NAME}} type;";
code_ += " void *value;";
@@ -1341,10 +1360,9 @@ class CppGenerator : public BaseGenerator {
if (!enum_def.uses_multiple_type_instances) {
code_ += " template <typename T>";
code_ += " void Set(T&& val) {";
code_ += " using RT = typename std::remove_reference<T>::type;";
code_ += " typedef typename std::remove_reference<T>::type RT;";
code_ += " Reset();";
code_ +=
" type = {{NAME}}Traits<typename RT::TableType>::enum_value;";
code_ += " type = {{NAME}}UnionTraits<RT>::enum_value;";
code_ += " if (type != {{NONE}}) {";
code_ += " value = new RT(std::forward<T>(val));";
code_ += " }";
@@ -1494,6 +1512,7 @@ class CppGenerator : public BaseGenerator {
if (opts_.generate_object_based_api) {
// Generate union Unpack() and Pack() functions.
code_ += "inline " + UnionUnPackSignature(enum_def, false) + " {";
code_ += " (void)resolver;";
code_ += " switch (type) {";
for (auto it = enum_def.Vals().begin(); it != enum_def.Vals().end();
++it) {
@@ -1524,6 +1543,7 @@ class CppGenerator : public BaseGenerator {
code_ += "";
code_ += "inline " + UnionPackSignature(enum_def, false) + " {";
code_ += " (void)_rehasher;";
code_ += " switch (type) {";
for (auto it = enum_def.Vals().begin(); it != enum_def.Vals().end();
++it) {