From b9efbf6a3db61b4b9e0b20fa4a5244218b4c5f19 Mon Sep 17 00:00:00 2001
From: Wouter van Oortmerssen <aardappel@gmail.com>
Date: Wed, 21 Dec 2016 17:45:27 -0800
Subject: [PATCH] Fixed more Windows build errors.

Change-Id: I556e1c103e8501dc144b16c8698463253de6f4fb
---
 samples/monster_generated.h                   |   2 +-
 src/idl_gen_cpp.cpp                           |   2 +-
 tests/monster_test.bfbs                       | Bin 3384 -> 3320 bytes
 tests/monster_test_generated.h                |   2 +-
 .../NamespaceA/NamespaceB/StructInNestedNS.go |   4 ++++
 .../NamespaceA/NamespaceB/TableInNestedNS.go  |   4 ++++
 .../NamespaceA/SecondTableInA.go              |   4 ++++
 .../NamespaceA/TableInFirstNS.go              |   4 ++++
 tests/namespace_test/NamespaceC/TableInC.go   |   4 ++++
 9 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/samples/monster_generated.h b/samples/monster_generated.h
index a3a2fb2a9..6c7b30598 100644
--- a/samples/monster_generated.h
+++ b/samples/monster_generated.h
@@ -56,7 +56,7 @@ template<> struct EquipmentTraits<Weapon> {
 struct EquipmentUnion {
   Equipment type;
 
-  flatbuffers::NativeTable *table = nullptr;
+  flatbuffers::NativeTable *table;
   EquipmentUnion() : type(Equipment_NONE), table(nullptr) {}
   EquipmentUnion(const EquipmentUnion &);
   EquipmentUnion &operator=(const EquipmentUnion &);
diff --git a/src/idl_gen_cpp.cpp b/src/idl_gen_cpp.cpp
index f308a7bcb..47bf37089 100644
--- a/src/idl_gen_cpp.cpp
+++ b/src/idl_gen_cpp.cpp
@@ -526,7 +526,7 @@ class CppGenerator : public BaseGenerator {
       // Generate a union type
       code += "struct " + enum_def.name + "Union {\n";
       code += "  " + enum_def.name + " type;\n\n";
-      code += "  flatbuffers::NativeTable *table = nullptr;\n";
+      code += "  flatbuffers::NativeTable *table;\n";
       code += "  " + enum_def.name + "Union() : type(";
       code += GetEnumValUse(enum_def, *enum_def.vals.Lookup("NONE"), parser_.opts);
       code += "), table(nullptr) {}\n";
diff --git a/tests/monster_test.bfbs b/tests/monster_test.bfbs
index 0369f896935ecf0822e50268c42f9fa4dfb9da87..41d9edb1c43c2965eddd178a73fa1c7c08409a7c 100644
GIT binary patch
literal 3320
zcmZu!O=w(I6h4zoGCxTsX&c+IjU_Fm1PMbr386@k7@HQsB+$f|RnwQu8)snV%`o#O
zG$P_cN>)W&ge<ZsB2r2hB3ZbQQe1^nN*7YPEaJk26cN-^qtEZVKQrSn7f#N7?|kRn
z^LNji42j6h<(Wk=tb`;bEK%u|0U5-T;IGISXbN-*^jU{U1bhoT8WZ`bN90Ld<ZJB5
zdPNGLPROY<8WQ;l6vlpTVP2g<S+V5dZvwV?QUqu5Nv#mnWf(;LqoBFXD^Af(&E9Z|
z<${}f%iGlUzJqKBv;?Al`u89J!)YQ9gCL;ax8WPlv+D#l+TN<MmtLJKc~#%7KoVE6
z_rfQHqvAe5ObD~SsK4Y^{lz?eS#s72?)!N^H|y1kki?-AMm$=dK4svIatM3o%%1i1
z-ymR4Nb?KxvtV)+J~Q@nAjVGrTVj8^R4CC=71MR_2@uao{h?y-<XPXt4&OyVcJZ8<
zLe1s#k4D}cR~O!2skp9ZVxTT_Ks(ldY}L6}-3)dK$k-=>cy;Z_>Gw3~49NJt;OE@R
zJSw<YcGlh0<w~jej<;T@W#|lTkAQeuLS;zj4liQbzc|jI_u3!s=$Emu>=aNB#BTFO
zd&fa7d9!Jk*C5-15g$!)2)>8F?}7gUo&ybbgYf(u@(J)k82l3ZY3Sv^_u$ks&?7v5
z0$Kr;@q7=sDEKAtG4KNTJ}3<OfzN*i!4Pf`^ECuwU;F4Ir&4h?OWCSl$$KB9QM<oc
z$3)*Q@TcSrg=Y=mmcnPpMV2AMW6u-R@uXZ-eL|ahMW@N@c-XvY@JXD^+ZI+*TGcBF
z_Nq+Q?RYm&{rd7uY?@M}M4t=(*x0#v5Clndo{fc;nqpZil?qk7l3Rx=mW~|oCnR0R
zA2IlxQ_a;TCswoG#svrOQow=5cfgOMldSz_e6<OGP2*$x;IBxkExtCMuG_z*@zDeD
zK^bj}uQuWDYkXwnWe^;b*Xwv2Z?pgKTV7~<d<FQU=xXbKGv4}7{Au98Vq4%x<a}Ga
z^`H28jgNi{K7c9F*1qwd_>VO{@-uk9oK<+v6zZ{FEEI8HX<Wy^UqO(N;W`eZPvP8R
z*~iG0&mjlvM@!2T_I+|%VTbWdyR_+n+)TFM_-nOnRt;6z#;ik6hs)6ERXwQZ3VX}-
z+#+qiFt)Lk9qfDLq_WMvw)Ho6#plpvgWW~{!)`xy9zloG+vcQ2N8c~t&T5^$L*QeW
z6vVUtZJ$qIy7c0HL?Gdup?zFm8O6PfB1+;}PmBf?FPPj_cUHZYCF~=(-NZ2`HixVJ
zX4%E_Q;lT`<u>xt4K?BzCw1(iKkH`L$JIR&HQV=~--Ss@EOlr<?`^oAU#e`v<EZjo
z&q(GxiRkzxx6$w$M9&yAR)}9K&Q3mCAF`Fa>tzZoi<w8#L5GRc^CPOxw=t5JEBR6-
zui8Y-^b2^G#5v7pb1LzCeRe3+sr+r^)5A9cVwu$O_R)7cub6YYsNVqz-!XR?BVe6!
zWswc7-_<<tTJ=Nl#pZq6=##OoMaOfvzi;eZS3T4C*5NZC<x*9?_($Id>O2FM`56W=
zSI0mt-=Ia`@zwW}IQl#S`V=-83v);xb=_;8kNun4e)k=4`b!LTdHx1IeAl!*mQ?kn
zgj2t<be<c2Ge3D8ysh>6-c|QfLOk~zh<q5-#`k4+eOy`3K|Tc{_5o-YbOS_NUFOc(
zI5-c+A$zFLQTNElKCJ56h?h8grsOw`Q+>XReW!}+|2X#5vc~m30Jphg^vwH*pbahW
zc@7>zMQz?FXH)BWBt83(H_I5uH%9jkIBiaVsCORJQqLv0-S%f7@w`j6|5z91#4cMG
z_8;@ky4cmY_nbq#E%xT>`#)gr1b;D8-`K6!kha30HZ`Qb>Z}#WwSSxo_V)l@nnnLY
z>W1llV?1l1$LbzPCnt)|s!=eEddw&NqK>2Px1Kn9mP*$EJZ@A(`_DWx57cS=KDWR3
l)2aH8H^><^eb)amG~%a?QDcL#wg2t;o>!}?AFn`&{0H?cVo(48

literal 3384
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

diff --git a/tests/monster_test_generated.h b/tests/monster_test_generated.h
index e52992c32..0b73b7a23 100644
--- a/tests/monster_test_generated.h
+++ b/tests/monster_test_generated.h
@@ -78,7 +78,7 @@ template<> struct AnyTraits<MyGame::Example2::Monster> {
 struct AnyUnion {
   Any type;
 
-  flatbuffers::NativeTable *table = nullptr;
+  flatbuffers::NativeTable *table;
   AnyUnion() : type(Any_NONE), table(nullptr) {}
   AnyUnion(const AnyUnion &);
   AnyUnion &operator=(const AnyUnion &);
diff --git a/tests/namespace_test/NamespaceA/NamespaceB/StructInNestedNS.go b/tests/namespace_test/NamespaceA/NamespaceB/StructInNestedNS.go
index 3de874b25..00840aa31 100644
--- a/tests/namespace_test/NamespaceA/NamespaceB/StructInNestedNS.go
+++ b/tests/namespace_test/NamespaceA/NamespaceB/StructInNestedNS.go
@@ -15,6 +15,10 @@ func (rcv *StructInNestedNS) Init(buf []byte, i flatbuffers.UOffsetT) {
 	rcv._tab.Pos = i
 }
 
+func (rcv *StructInNestedNS) Table() flatbuffers.Table {
+	return rcv._tab.Table
+}
+
 func (rcv *StructInNestedNS) A() int32 {
 	return rcv._tab.GetInt32(rcv._tab.Pos + flatbuffers.UOffsetT(0))
 }
diff --git a/tests/namespace_test/NamespaceA/NamespaceB/TableInNestedNS.go b/tests/namespace_test/NamespaceA/NamespaceB/TableInNestedNS.go
index a25ae7be4..0e767b84e 100644
--- a/tests/namespace_test/NamespaceA/NamespaceB/TableInNestedNS.go
+++ b/tests/namespace_test/NamespaceA/NamespaceB/TableInNestedNS.go
@@ -22,6 +22,10 @@ func (rcv *TableInNestedNS) Init(buf []byte, i flatbuffers.UOffsetT) {
 	rcv._tab.Pos = i
 }
 
+func (rcv *TableInNestedNS) Table() flatbuffers.Table {
+	return rcv._tab
+}
+
 func (rcv *TableInNestedNS) Foo() int32 {
 	o := flatbuffers.UOffsetT(rcv._tab.Offset(4))
 	if o != 0 {
diff --git a/tests/namespace_test/NamespaceA/SecondTableInA.go b/tests/namespace_test/NamespaceA/SecondTableInA.go
index f53a1ead1..bd691e81f 100644
--- a/tests/namespace_test/NamespaceA/SecondTableInA.go
+++ b/tests/namespace_test/NamespaceA/SecondTableInA.go
@@ -22,6 +22,10 @@ func (rcv *SecondTableInA) Init(buf []byte, i flatbuffers.UOffsetT) {
 	rcv._tab.Pos = i
 }
 
+func (rcv *SecondTableInA) Table() flatbuffers.Table {
+	return rcv._tab
+}
+
 func (rcv *SecondTableInA) ReferToC(obj *TableInC) *TableInC {
 	o := flatbuffers.UOffsetT(rcv._tab.Offset(4))
 	if o != 0 {
diff --git a/tests/namespace_test/NamespaceA/TableInFirstNS.go b/tests/namespace_test/NamespaceA/TableInFirstNS.go
index 4820a8ae5..b3354d305 100644
--- a/tests/namespace_test/NamespaceA/TableInFirstNS.go
+++ b/tests/namespace_test/NamespaceA/TableInFirstNS.go
@@ -22,6 +22,10 @@ func (rcv *TableInFirstNS) Init(buf []byte, i flatbuffers.UOffsetT) {
 	rcv._tab.Pos = i
 }
 
+func (rcv *TableInFirstNS) Table() flatbuffers.Table {
+	return rcv._tab
+}
+
 func (rcv *TableInFirstNS) FooTable(obj *TableInNestedNS) *TableInNestedNS {
 	o := flatbuffers.UOffsetT(rcv._tab.Offset(4))
 	if o != 0 {
diff --git a/tests/namespace_test/NamespaceC/TableInC.go b/tests/namespace_test/NamespaceC/TableInC.go
index d0d8b002f..7e6c73383 100644
--- a/tests/namespace_test/NamespaceC/TableInC.go
+++ b/tests/namespace_test/NamespaceC/TableInC.go
@@ -22,6 +22,10 @@ func (rcv *TableInC) Init(buf []byte, i flatbuffers.UOffsetT) {
 	rcv._tab.Pos = i
 }
 
+func (rcv *TableInC) Table() flatbuffers.Table {
+	return rcv._tab
+}
+
 func (rcv *TableInC) ReferToA1(obj *TableInFirstNS) *TableInFirstNS {
 	o := flatbuffers.UOffsetT(rcv._tab.Offset(4))
 	if o != 0 {