BigfootDev/flatbuffers
1
0
Fork 1
mirror of https://github.com/google/flatbuffers.git synced 2026-07-03 01:32:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move Traits struct and Create method out of --cpp-static-reflection. (#6503)

Browse Source
This commit is contained in:
dpacbach
2021-03-08 13:59:17 -05:00
committed by GitHub
parent 9a4f1f434b
commit b240ab704d
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/idl_gen_cpp.cpp
View File

@@ -2159,13 +2159,15 @@ class CppGenerator : public BaseGenerator {
// We have a table and not a struct. // We have a table and not a struct.
code_ += " static auto constexpr Create = Create{{STRUCT_NAME}};"; code_ += " static auto constexpr Create = Create{{STRUCT_NAME}};";
} }
code_ += " static constexpr auto name = \"{{STRUCT_NAME}}\";"; if (opts_.cpp_static_reflection) {
code_ += code_ += " static constexpr auto name = \"{{STRUCT_NAME}}\";";
" static constexpr auto fully_qualified_name = " code_ +=
"\"{{FULLY_QUALIFIED_NAME}}\";"; " static constexpr auto fully_qualified_name = "
GenFieldNames(struct_def); "\"{{FULLY_QUALIFIED_NAME}}\";";
GenFieldTypeHelper(struct_def); GenFieldNames(struct_def);
GenFieldsNumber(struct_def); GenFieldTypeHelper(struct_def);
GenFieldsNumber(struct_def);
}
code_ += "};"; code_ += "};";
code_ += ""; code_ += "";
} }
@@ -2227,7 +2229,7 @@ class CppGenerator : public BaseGenerator {
code_ += " typedef {{NATIVE_NAME}} NativeTableType;"; code_ += " typedef {{NATIVE_NAME}} NativeTableType;";
} }
code_ += " typedef {{STRUCT_NAME}}Builder Builder;"; 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) { if (opts_.mini_reflect != IDLOptions::kNone) {
code_ += code_ +=
" static const flatbuffers::TypeTable *MiniReflectTypeTable() {"; " static const flatbuffers::TypeTable *MiniReflectTypeTable() {";
@@ -2519,7 +2521,7 @@ class CppGenerator : public BaseGenerator {
// Definition for type traits for this table type. This allows querying var- // Definition for type traits for this table type. This allows querying var-
// ious compile-time traits of the table. // 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 // Generate a CreateXDirect function with vector types as parameters
if (opts_.cpp_direct_copy && has_string_or_vector_fields) { if (opts_.cpp_direct_copy && has_string_or_vector_fields) {
@@ -3293,7 +3295,7 @@ class CppGenerator : public BaseGenerator {
code_ += ""; code_ += "";
code_ += " public:"; 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. // Make TypeTable accessible via the generated struct.
if (opts_.mini_reflect != IDLOptions::kNone) { if (opts_.mini_reflect != IDLOptions::kNone) {
@@ -3392,7 +3394,7 @@ class CppGenerator : public BaseGenerator {
// Definition for type traits for this table type. This allows querying var- // Definition for type traits for this table type. This allows querying var-
// ious compile-time traits of the table. // 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 // Set up the correct namespace. Only open a namespace if the existing one is