Skip to content

[C++17] Move Traits struct and Create method out of --cpp-static-reflection. #6503

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aardappel merged 1 commit into from
Mar 8, 2021
Merged

[C++17] Move Traits struct and Create method out of --cpp-static-reflection. #6503

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 13 additions & 11 deletions src/idl_gen_cpp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2159,13 +2159,15 @@ class CppGenerator : public BaseGenerator {
// We have a table and not a struct.
code_ += " static auto constexpr Create = Create{{STRUCT_NAME}};";
}
code_ += " static constexpr auto name = \"{{STRUCT_NAME}}\";";
code_ +=
" static constexpr auto fully_qualified_name = "
"\"{{FULLY_QUALIFIED_NAME}}\";";
GenFieldNames(struct_def);
GenFieldTypeHelper(struct_def);
GenFieldsNumber(struct_def);
if (opts_.cpp_static_reflection) {
code_ += " static constexpr auto name = \"{{STRUCT_NAME}}\";";
code_ +=
" static constexpr auto fully_qualified_name = "
"\"{{FULLY_QUALIFIED_NAME}}\";";
GenFieldNames(struct_def);
GenFieldTypeHelper(struct_def);
GenFieldsNumber(struct_def);
}
code_ += "};";
code_ += "";
}
Expand Down Expand Up @@ -2227,7 +2229,7 @@ class CppGenerator : public BaseGenerator {
code_ += " typedef {{NATIVE_NAME}} NativeTableType;";
}
code_ += " typedef {{STRUCT_NAME}}Builder Builder;";
if (opts_.cpp_static_reflection) { code_ += " struct Traits;"; }
if (opts_.g_cpp_std >= cpp::CPP_STD_17) { code_ += " struct Traits;"; }
if (opts_.mini_reflect != IDLOptions::kNone) {
code_ +=
" static const flatbuffers::TypeTable *MiniReflectTypeTable() {";
Expand Down Expand Up @@ -2519,7 +2521,7 @@ class CppGenerator : public BaseGenerator {

// Definition for type traits for this table type. This allows querying var-
// ious compile-time traits of the table.
if (opts_.cpp_static_reflection) { GenTraitsStruct(struct_def); }
if (opts_.g_cpp_std >= cpp::CPP_STD_17) { GenTraitsStruct(struct_def); }

// Generate a CreateXDirect function with vector types as parameters
if (opts_.cpp_direct_copy && has_string_or_vector_fields) {
Expand Down Expand Up @@ -3293,7 +3295,7 @@ class CppGenerator : public BaseGenerator {
code_ += "";
code_ += " public:";

if (opts_.cpp_static_reflection) { code_ += " struct Traits;"; }
if (opts_.g_cpp_std >= cpp::CPP_STD_17) { code_ += " struct Traits;"; }

// Make TypeTable accessible via the generated struct.
if (opts_.mini_reflect != IDLOptions::kNone) {
Expand Down Expand Up @@ -3392,7 +3394,7 @@ class CppGenerator : public BaseGenerator {

// Definition for type traits for this table type. This allows querying var-
// ious compile-time traits of the table.
if (opts_.cpp_static_reflection) { GenTraitsStruct(struct_def); }
if (opts_.g_cpp_std >= cpp::CPP_STD_17) { GenTraitsStruct(struct_def); }
}

// Set up the correct namespace. Only open a namespace if the existing one is
Expand Down