Sitelet https://github.com/b-nonymous/flatbuffers/commit/b9efbf6a3db61b4b9e0b20fa4a5244218b4c5f19
Skip to content

Commit b9efbf6

Browse files
aardappelaardappel
committed
Fixed more Windows build errors.
Change-Id: I556e1c103e8501dc144b16c8698463253de6f4fb
1 parent 13194ec commit b9efbf6

9 files changed

Lines changed: 23 additions & 3 deletions

File tree

‎samples/monster_generated.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ template<> struct EquipmentTraits<Weapon> {
5656
struct EquipmentUnion {
5757
Equipment type;
5858

59-
flatbuffers::NativeTable *table = nullptr;
59+
flatbuffers::NativeTable *table;
6060
EquipmentUnion() : type(Equipment_NONE), table(nullptr) {}
6161
EquipmentUnion(const EquipmentUnion &);
6262
EquipmentUnion &operator=(const EquipmentUnion &);

‎src/idl_gen_cpp.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -526,7 +526,7 @@ class CppGenerator : public BaseGenerator {
526526
// Generate a union type
527527
code += "struct " + enum_def.name + "Union {\n";
528528
code += " " + enum_def.name + " type;\n\n";
529-
code += " flatbuffers::NativeTable *table = nullptr;\n";
529+
code += " flatbuffers::NativeTable *table;\n";
530530
code += " " + enum_def.name + "Union() : type(";
531531
code += GetEnumValUse(enum_def, *enum_def.vals.Lookup("NONE"), parser_.opts);
532532
code += "), table(nullptr) {}\n";

‎tests/monster_test.bfbs‎

-64 Bytes
Binary file not shown.

‎tests/monster_test_generated.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ template<> struct AnyTraits<MyGame::Example2::Monster> {
7878
struct AnyUnion {
7979
Any type;
8080

81-
flatbuffers::NativeTable *table = nullptr;
81+
flatbuffers::NativeTable *table;
8282
AnyUnion() : type(Any_NONE), table(nullptr) {}
8383
AnyUnion(const AnyUnion &);
8484
AnyUnion &operator=(const AnyUnion &);

‎tests/namespace_test/NamespaceA/NamespaceB/StructInNestedNS.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ func (rcv *StructInNestedNS) Init(buf []byte, i flatbuffers.UOffsetT) {
1515
rcv._tab.Pos = i
1616
}
1717

18+
func (rcv *StructInNestedNS) Table() flatbuffers.Table {
19+
return rcv._tab.Table
20+
}
21+
1822
func (rcv *StructInNestedNS) A() int32 {
1923
return rcv._tab.GetInt32(rcv._tab.Pos + flatbuffers.UOffsetT(0))
2024
}

‎tests/namespace_test/NamespaceA/NamespaceB/TableInNestedNS.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ func (rcv *TableInNestedNS) Init(buf []byte, i flatbuffers.UOffsetT) {
2222
rcv._tab.Pos = i
2323
}
2424

25+
func (rcv *TableInNestedNS) Table() flatbuffers.Table {
26+
return rcv._tab
27+
}
28+
2529
func (rcv *TableInNestedNS) Foo() int32 {
2630
o := flatbuffers.UOffsetT(rcv._tab.Offset(4))
2731
if o != 0 {

‎tests/namespace_test/NamespaceA/SecondTableInA.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ func (rcv *SecondTableInA) Init(buf []byte, i flatbuffers.UOffsetT) {
2222
rcv._tab.Pos = i
2323
}
2424

25+
func (rcv *SecondTableInA) Table() flatbuffers.Table {
26+
return rcv._tab
27+
}
28+
2529
func (rcv *SecondTableInA) ReferToC(obj *TableInC) *TableInC {
2630
o := flatbuffers.UOffsetT(rcv._tab.Offset(4))
2731
if o != 0 {

‎tests/namespace_test/NamespaceA/TableInFirstNS.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ func (rcv *TableInFirstNS) Init(buf []byte, i flatbuffers.UOffsetT) {
2222
rcv._tab.Pos = i
2323
}
2424

25+
func (rcv *TableInFirstNS) Table() flatbuffers.Table {
26+
return rcv._tab
27+
}
28+
2529
func (rcv *TableInFirstNS) FooTable(obj *TableInNestedNS) *TableInNestedNS {
2630
o := flatbuffers.UOffsetT(rcv._tab.Offset(4))
2731
if o != 0 {

‎tests/namespace_test/NamespaceC/TableInC.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ func (rcv *TableInC) Init(buf []byte, i flatbuffers.UOffsetT) {
2222
rcv._tab.Pos = i
2323
}
2424

25+
func (rcv *TableInC) Table() flatbuffers.Table {
26+
return rcv._tab
27+
}
28+
2529
func (rcv *TableInC) ReferToA1(obj *TableInFirstNS) *TableInFirstNS {
2630
o := flatbuffers.UOffsetT(rcv._tab.Offset(4))
2731
if o != 0 {

0 commit comments

Comments
 (0)