BigfootDev/flatbuffers
1
0
Fork 1
mirror of https://github.com/google/flatbuffers.git synced 2026-06-25 21:28:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed generation of c++ code with flags (#6637)

Browse Source 
* Fixed generation of c++ code with flags

* tweaking const

* moved to CONSTEXPR_CP11
This commit is contained in:
Derek Bailey
2021-05-15 13:27:24 -07:00
committed by GitHub
parent ef0eb3701d
commit 4867c94564
5 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@@ -483,9 +483,9 @@ if(FLATBUFFERS_BUILD_TESTS)
# TODO Add (monster_test.fbs monsterdata_test.json)->monsterdata_test.mon # TODO Add (monster_test.fbs monsterdata_test.json)->monsterdata_test.mon
compile_flatbuffers_schema_to_cpp(tests/monster_test.fbs) compile_flatbuffers_schema_to_cpp(tests/monster_test.fbs)
compile_flatbuffers_schema_to_binary(tests/monster_test.fbs) compile_flatbuffers_schema_to_binary(tests/monster_test.fbs)
compile_flatbuffers_schema_to_cpp(tests/namespace_test/namespace_test1.fbs) compile_flatbuffers_schema_to_cpp_opt(tests/namespace_test/namespace_test1.fbs "--no-includes;--gen-compare;--gen-name-strings")
compile_flatbuffers_schema_to_cpp(tests/namespace_test/namespace_test2.fbs) compile_flatbuffers_schema_to_cpp_opt(tests/namespace_test/namespace_test2.fbs "--no-includes;--gen-compare;--gen-name-strings")
compile_flatbuffers_schema_to_cpp(tests/union_vector/union_vector.fbs) compile_flatbuffers_schema_to_cpp_opt(tests/union_vector/union_vector.fbs "--no-includes;--gen-compare;--gen-name-strings")
compile_flatbuffers_schema_to_cpp(tests/optional_scalars.fbs) compile_flatbuffers_schema_to_cpp(tests/optional_scalars.fbs)
compile_flatbuffers_schema_to_cpp_opt(tests/native_type_test.fbs "") compile_flatbuffers_schema_to_cpp_opt(tests/native_type_test.fbs "")
compile_flatbuffers_schema_to_cpp_opt(tests/arrays_test.fbs "--scoped-enums;--gen-compare") compile_flatbuffers_schema_to_cpp_opt(tests/arrays_test.fbs "--scoped-enums;--gen-compare")

2
src/idl_gen_cpp.cpp
View File

@@ -1620,7 +1620,7 @@ class CppGenerator : public BaseGenerator {
if (!opts_.generate_name_strings) { return; } if (!opts_.generate_name_strings) { return; }
auto fullname = struct_def.defined_namespace->GetFullyQualifiedName(name); auto fullname = struct_def.defined_namespace->GetFullyQualifiedName(name);
code_.SetValue("NAME", fullname); code_.SetValue("NAME", fullname);
code_.SetValue("CONSTEXPR", "FLATBUFFERS_CONSTEXPR"); code_.SetValue("CONSTEXPR", "FLATBUFFERS_CONSTEXPR_CPP11");
code_ += " static {{CONSTEXPR}} const char *GetFullyQualifiedName() {"; code_ += " static {{CONSTEXPR}} const char *GetFullyQualifiedName() {";
code_ += " return \"{{NAME}}\";"; code_ += " return \"{{NAME}}\";";
code_ += " }"; code_ += " }";

6
tests/namespace_test/namespace_test1_generated.h
View File

@@ -170,7 +170,7 @@ FLATBUFFERS_MANUALLY_ALIGNED_STRUCT(4) StructInNestedNS FLATBUFFERS_FINAL_CLASS
static const flatbuffers::TypeTable *MiniReflectTypeTable() { static const flatbuffers::TypeTable *MiniReflectTypeTable() {
return StructInNestedNSTypeTable(); return StructInNestedNSTypeTable();
} }
static FLATBUFFERS_CONSTEXPR const char *GetFullyQualifiedName() { static FLATBUFFERS_CONSTEXPR_CPP11 const char *GetFullyQualifiedName() {
return "NamespaceA.NamespaceB.StructInNestedNS"; return "NamespaceA.NamespaceB.StructInNestedNS";
} }
StructInNestedNS() StructInNestedNS()
@@ -209,7 +209,7 @@ inline bool operator!=(const StructInNestedNS &lhs, const StructInNestedNS &rhs)
struct TableInNestedNST : public flatbuffers::NativeTable { struct TableInNestedNST : public flatbuffers::NativeTable {
typedef TableInNestedNS TableType; typedef TableInNestedNS TableType;
static FLATBUFFERS_CONSTEXPR const char *GetFullyQualifiedName() { static FLATBUFFERS_CONSTEXPR_CPP11 const char *GetFullyQualifiedName() {
return "NamespaceA.NamespaceB.TableInNestedNST"; return "NamespaceA.NamespaceB.TableInNestedNST";
} }
int32_t foo = 0; int32_t foo = 0;
@@ -231,7 +231,7 @@ struct TableInNestedNS FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
static const flatbuffers::TypeTable *MiniReflectTypeTable() { static const flatbuffers::TypeTable *MiniReflectTypeTable() {
return TableInNestedNSTypeTable(); return TableInNestedNSTypeTable();
} }
static FLATBUFFERS_CONSTEXPR const char *GetFullyQualifiedName() { static FLATBUFFERS_CONSTEXPR_CPP11 const char *GetFullyQualifiedName() {
return "NamespaceA.NamespaceB.TableInNestedNS"; return "NamespaceA.NamespaceB.TableInNestedNS";
} }
enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {

12
tests/namespace_test/namespace_test2_generated.h
View File

@@ -59,7 +59,7 @@ inline const flatbuffers::TypeTable *SecondTableInATypeTable();
struct TableInFirstNST : public flatbuffers::NativeTable { struct TableInFirstNST : public flatbuffers::NativeTable {
typedef TableInFirstNS TableType; typedef TableInFirstNS TableType;
static FLATBUFFERS_CONSTEXPR const char *GetFullyQualifiedName() { static FLATBUFFERS_CONSTEXPR_CPP11 const char *GetFullyQualifiedName() {
return "NamespaceA.TableInFirstNST"; return "NamespaceA.TableInFirstNST";
} }
flatbuffers::unique_ptr<NamespaceA::NamespaceB::TableInNestedNST> foo_table{}; flatbuffers::unique_ptr<NamespaceA::NamespaceB::TableInNestedNST> foo_table{};
@@ -87,7 +87,7 @@ struct TableInFirstNS FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
static const flatbuffers::TypeTable *MiniReflectTypeTable() { static const flatbuffers::TypeTable *MiniReflectTypeTable() {
return TableInFirstNSTypeTable(); return TableInFirstNSTypeTable();
} }
static FLATBUFFERS_CONSTEXPR const char *GetFullyQualifiedName() { static FLATBUFFERS_CONSTEXPR_CPP11 const char *GetFullyQualifiedName() {
return "NamespaceA.TableInFirstNS"; return "NamespaceA.TableInFirstNS";
} }
enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
@@ -202,7 +202,7 @@ namespace NamespaceC {
struct TableInCT : public flatbuffers::NativeTable { struct TableInCT : public flatbuffers::NativeTable {
typedef TableInC TableType; typedef TableInC TableType;
static FLATBUFFERS_CONSTEXPR const char *GetFullyQualifiedName() { static FLATBUFFERS_CONSTEXPR_CPP11 const char *GetFullyQualifiedName() {
return "NamespaceC.TableInCT"; return "NamespaceC.TableInCT";
} }
flatbuffers::unique_ptr<NamespaceA::TableInFirstNST> refer_to_a1{}; flatbuffers::unique_ptr<NamespaceA::TableInFirstNST> refer_to_a1{};
@@ -226,7 +226,7 @@ struct TableInC FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
static const flatbuffers::TypeTable *MiniReflectTypeTable() { static const flatbuffers::TypeTable *MiniReflectTypeTable() {
return TableInCTypeTable(); return TableInCTypeTable();
} }
static FLATBUFFERS_CONSTEXPR const char *GetFullyQualifiedName() { static FLATBUFFERS_CONSTEXPR_CPP11 const char *GetFullyQualifiedName() {
return "NamespaceC.TableInC"; return "NamespaceC.TableInC";
} }
enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
@@ -297,7 +297,7 @@ namespace NamespaceA {
struct SecondTableInAT : public flatbuffers::NativeTable { struct SecondTableInAT : public flatbuffers::NativeTable {
typedef SecondTableInA TableType; typedef SecondTableInA TableType;
static FLATBUFFERS_CONSTEXPR const char *GetFullyQualifiedName() { static FLATBUFFERS_CONSTEXPR_CPP11 const char *GetFullyQualifiedName() {
return "NamespaceA.SecondTableInAT"; return "NamespaceA.SecondTableInAT";
} }
flatbuffers::unique_ptr<NamespaceC::TableInCT> refer_to_c{}; flatbuffers::unique_ptr<NamespaceC::TableInCT> refer_to_c{};
@@ -319,7 +319,7 @@ struct SecondTableInA FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
static const flatbuffers::TypeTable *MiniReflectTypeTable() { static const flatbuffers::TypeTable *MiniReflectTypeTable() {
return SecondTableInATypeTable(); return SecondTableInATypeTable();
} }
static FLATBUFFERS_CONSTEXPR const char *GetFullyQualifiedName() { static FLATBUFFERS_CONSTEXPR_CPP11 const char *GetFullyQualifiedName() {
return "NamespaceA.SecondTableInA"; return "NamespaceA.SecondTableInA";
} }
enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {

12
tests/union_vector/union_vector_generated.h
View File

@@ -202,7 +202,7 @@ FLATBUFFERS_MANUALLY_ALIGNED_STRUCT(4) Rapunzel FLATBUFFERS_FINAL_CLASS {
static const flatbuffers::TypeTable *MiniReflectTypeTable() { static const flatbuffers::TypeTable *MiniReflectTypeTable() {
return RapunzelTypeTable(); return RapunzelTypeTable();
} }
static FLATBUFFERS_CONSTEXPR const char *GetFullyQualifiedName() { static FLATBUFFERS_CONSTEXPR_CPP11 const char *GetFullyQualifiedName() {
return "Rapunzel"; return "Rapunzel";
} }
Rapunzel() Rapunzel()
@@ -238,7 +238,7 @@ FLATBUFFERS_MANUALLY_ALIGNED_STRUCT(4) BookReader FLATBUFFERS_FINAL_CLASS {
static const flatbuffers::TypeTable *MiniReflectTypeTable() { static const flatbuffers::TypeTable *MiniReflectTypeTable() {
return BookReaderTypeTable(); return BookReaderTypeTable();
} }
static FLATBUFFERS_CONSTEXPR const char *GetFullyQualifiedName() { static FLATBUFFERS_CONSTEXPR_CPP11 const char *GetFullyQualifiedName() {
return "BookReader"; return "BookReader";
} }
BookReader() BookReader()
@@ -268,7 +268,7 @@ inline bool operator!=(const BookReader &lhs, const BookReader &rhs) {
struct AttackerT : public flatbuffers::NativeTable { struct AttackerT : public flatbuffers::NativeTable {
typedef Attacker TableType; typedef Attacker TableType;
static FLATBUFFERS_CONSTEXPR const char *GetFullyQualifiedName() { static FLATBUFFERS_CONSTEXPR_CPP11 const char *GetFullyQualifiedName() {
return "AttackerT"; return "AttackerT";
} }
int32_t sword_attack_damage = 0; int32_t sword_attack_damage = 0;
@@ -290,7 +290,7 @@ struct Attacker FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
static const flatbuffers::TypeTable *MiniReflectTypeTable() { static const flatbuffers::TypeTable *MiniReflectTypeTable() {
return AttackerTypeTable(); return AttackerTypeTable();
} }
static FLATBUFFERS_CONSTEXPR const char *GetFullyQualifiedName() { static FLATBUFFERS_CONSTEXPR_CPP11 const char *GetFullyQualifiedName() {
return "Attacker"; return "Attacker";
} }
enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
@@ -342,7 +342,7 @@ flatbuffers::Offset<Attacker> CreateAttacker(flatbuffers::FlatBufferBuilder &_fb
struct MovieT : public flatbuffers::NativeTable { struct MovieT : public flatbuffers::NativeTable {
typedef Movie TableType; typedef Movie TableType;
static FLATBUFFERS_CONSTEXPR const char *GetFullyQualifiedName() { static FLATBUFFERS_CONSTEXPR_CPP11 const char *GetFullyQualifiedName() {
return "MovieT"; return "MovieT";
} }
CharacterUnion main_character{}; CharacterUnion main_character{};
@@ -366,7 +366,7 @@ struct Movie FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
static const flatbuffers::TypeTable *MiniReflectTypeTable() { static const flatbuffers::TypeTable *MiniReflectTypeTable() {
return MovieTypeTable(); return MovieTypeTable();
} }
static FLATBUFFERS_CONSTEXPR const char *GetFullyQualifiedName() { static FLATBUFFERS_CONSTEXPR_CPP11 const char *GetFullyQualifiedName() {
return "Movie"; return "Movie";
} }
enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {