From 4c39cf54fab01b81e6ced95dab1005b6cf4718db Mon Sep 17 00:00:00 2001
From: Doyle <Doy-lee@users.noreply.github.com>
Date: Tue, 23 Oct 2018 11:55:02 +1100
Subject: [PATCH] Update submodules and fix gcc 4.8.4 build (#296)

---
 external/rapidjson             |   2 +-
 external/unbound               |   2 +-
 src/rpc/daemon_messages.h      |   4 ++--
 tests/data/wallet_testnet.keys | Bin 1204 -> 1288 bytes
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/external/rapidjson b/external/rapidjson
index 129d19ba7..67fac85e9 160000
--- a/external/rapidjson
+++ b/external/rapidjson
@@ -1 +1 @@
-Subproject commit 129d19ba7f496df5e33658527a7158c79b99c21c
+Subproject commit 67fac85e96220f69076121d569abd15471abb6bf
diff --git a/external/unbound b/external/unbound
index d3724dfa5..7f2396795 160000
--- a/external/unbound
+++ b/external/unbound
@@ -1 +1 @@
-Subproject commit d3724dfa553429d368c27aef160f02f5e8b8075f
+Subproject commit 7f23967954736dcaa366806b9eaba7e2bdfede11
diff --git a/src/rpc/daemon_messages.h b/src/rpc/daemon_messages.h
index be3138e3b..bb05b45fa 100644
--- a/src/rpc/daemon_messages.h
+++ b/src/rpc/daemon_messages.h
@@ -62,7 +62,7 @@ class classname \
 #define END_RPC_MESSAGE_RESPONSE };
 #define END_RPC_MESSAGE_CLASS };
 
-#define COMMA() ,
+#define COMMA ,
 
 // NOTE: when using a type with multiple template parameters,
 // replace any comma in the template specifier with the macro
@@ -118,7 +118,7 @@ BEGIN_RPC_MESSAGE_CLASS(GetTransactions);
     RPC_MESSAGE_MEMBER(std::vector<crypto::hash>, tx_hashes);
   END_RPC_MESSAGE_REQUEST;
   BEGIN_RPC_MESSAGE_RESPONSE;
-    RPC_MESSAGE_MEMBER(std::unordered_map<crypto::hash COMMA() cryptonote::rpc::transaction_info>, txs);
+    RPC_MESSAGE_MEMBER(std::unordered_map<crypto::hash COMMA cryptonote::rpc::transaction_info>, txs);
     RPC_MESSAGE_MEMBER(std::vector<crypto::hash>, missed_hashes);
   END_RPC_MESSAGE_RESPONSE;
 END_RPC_MESSAGE_CLASS;
diff --git a/tests/data/wallet_testnet.keys b/tests/data/wallet_testnet.keys
index 032e0599f06a70e5713ce4243b5ccd3704a8ce86..dd3ca90edbcbe400f49d1f6e2d104be7e7c89c90 100755
GIT binary patch
literal 1288
zcmV+j1^4=Dd&%$`(xxx|3I1zo0&`0tG}w*?DuL?yFAjZUG+a=?r|0c-Tm%~<Tiv%M
zw#FIH)nkyi*8AzXD<*-kq%CqH<4&@Q>o@({OeC061o5`-k8Cf@@Ph29dx_tK3A<1o
zA-c$}5f~|kmW3Nsd2gUvAEkNrded3%D$Db}4UC8bHgZan0~cGdNqN2xqGCuTB7@2+
zCtBo+U)B3Xi;4`iP(WmJ$2eh*i|4@&c`Z0xpJHEr_PlC`t)yP=#vnd9HMd5!?j*qE
z)pf6`QbeWt${53QyQOR}i9J-w;Pq^y+Z22Hj1p%Pt#9>=UR{`jGWn2{z1VW!QPfd_
zcezdzOxQL|QXTDmlY@^+c?;WR;wfI%+Zij^B=p7(3n=zb83UtPXz-az=lOtF!iw~U
zP{DCT7T6PBXEkt(>jNuI#!sn_^J26w<JMQ@32+?pmzrGZ427rRlS5&5aID6Sn<-`z
zY0v2n!#FHSWvxZ5+Dv+1M!-fR4RP$lflLL}QGe96q^ZAb5(_Yh1buTdN#jeTRTiI#
z5CXlZirip^udB?*_*ur0mSqVzedj?P;wR6`!R>s7uJrw|00TE|8-mph*9Naw{79eg
zNQzdWxLlr1n~Ol4tyBHKpJ2$WjR6i=8WU(7V(py=iLP6wHtk-$M%;r}kDw^6JqN9B
z(k^zlz4)weBc9VnN=n~C)YyT}jmMsQU3@mwahWI^Bd4__XeX-yr?pnHBvk6~RTBNW
zVTVzgh1LswE~R2PXzE+nodvzIV+#`4)Vl7@zRLiWho=cgUftqmsT&%ut||5pgit7f
z4^B>Ai_r0>(fd=!D|>RC<8piyg(8*;iS?4mt@oJ2on_fi)^-1U@&=^peF#A)G*c@g
zRx(<~`ZdyWDe?JjpX3-xu2Ah`*L+rk&D!KjfN8mVmbczTOhhu5FRZ?dQ~7;s3UQbI
zJ#nze-ne3og#fERNrkLhF!YL?nf{;UVmL~;OZP!;)!%Oj%I%3Q!@zm8^?x@L3Cvh3
z`pumxy+3{wrRf+BnWC<MmW}b#64movuc!3wRo2<J3E|BNOHLj*59-|=LXJ5GmnWrJ
z7T`Q2ZIiY+;h+3S!slx&P>2C|<l9qp%g~~`cYU$0_X0iJTl02PV>kdfl(S=~F10;}
z7xwb?xa(3zgO=h8ctmnvN9C;=E-?FX@5uK@BX!xGwz{NQSCDc$cV~V8h>pDV)F@bO
zAI*0#qJ9-u21%`j`5g6_7Mtwko^9x09W7ECZhIlm(WvjS*XHG+JGD+9ZHZ%_r)W`|
zIf!?y;Em{{{(A*3&G<2INrT`2fG{e|ML^y}+uvuQ$g&qeh>v>8zb<&HxZPSTx6<=M
z9YYKVWGN535J9RTA0fP%+y<GPr0I;bp(_bY<}9dNS}rP)<jCH*o9!Bnb4f2?>OopT
zIrsaYwn?He5WWE{_NY>KcakUrZk;}_UgAsRli!CY?Wn?=hF5;+hZTm=bKhgJ$!d>N
zD|@8@Ph|b%3Y;4+bjzWZXJdJ<rmM12YMy5N8IhIAz;$u$Vy=r^!r?bJ_9}9DVCC03
z%6GCNWqUjvbrvl+4ILT3D^tcuzIgaSZagdNywkWSYg(v_ynu-eqscR(i?kJ)KHW41
yG~7eu)Z_~okjq|*NO7#(vnxz?;^K;CEz(t^(T$lFdZjJ)ZR}fdciOo_;nRY+`iMOM

literal 1204
zcmV;l1WWtxpKa3In`<ws36#sbyaF!_!K_P9w<@BQqtZir5&WMg%DZ@kFjDupeT=UL
z4Ial0CbD(iZH~hT)|<hoo`rH(B_mT!dS6fVrtAQvMKtD&_WC}r%V&JNUa4v!Kd(Y;
z{I>Y&TZ?BeGOPc65f+`6PyW?X0*c^XfS*Ng82ko$@Bx!`sxSr5ARu98*_8)QHXbNi
zuwN!Qs<Hw>sN#dnyn~~@7G54Z4{h=;1dW`;oTO{u%kKSq#-xt#ZY$;mt28USjiggW
zlPrXXqgF5A!iD{fiV@n{BN1D~jfSwN0>mIs@%s!uz-XE@om&5j{e5dV3Ub3~Zy+YP
zo3cGo@{?N;Sr)9pd#(s6?1O-_?Z3^qVn&Yk4TJZ^Lp(-on}fqIurC*sDvK9wG_7_O
zH3cX`y1?l>8#e4{MUE(YqwRp>6v&aRI>CSZh>yoRMC51(=u{{HEQv|g#3f?S9;%q5
z9KH{o{VPAgE7?~wVxt-Hg`syMV8P9gy=mTWpLfU}@7API2=R_CbgEAK!ZV8so&rr#
zpFxMMgATFSrHm4Oc|l9QBCokKdy5tL2VBAWiVYL7)i)+BcgRs(+!*t)8P`+WZ134d
z>Z%Uq_RG`>l_Yt?&Y2X+E=V|+i`{=M44Ju#i9xe!Y%l)Wf59~iQfe(6KRL{Sc8bas
za74^{6T-;29=u%g645f7<x7oZiwM=JY6@10VIlV(`dz!=n40wU%QU3de~apDUm^x{
zEqh<ebU2-)lOD&N4#h~I!A_1x1=g=6ym_pjlqOIvK!yV1Y7}5Tpd+ze-XTom#6z3V
z11jjyQRVb21=#`(K9+Q5IvM+)Ja(F33eZ(ow|DAte~1%UzcK236uL9Ove=*WPsLGV
z|8)hmO=i?In>Rm~q-gqH5!me27!2c3ca|e3#Q4iQ&7z_~YRHkRzB;4a+3^G~>Z{PY
z^X<di=h&wUWPSi0&*0a-dbzt%Ft^pGk`Az+rx604jj6m{OQE#ykw&$bYQ4af#P4e9
zgN0bA^dI)J+hD$_i(EZ|Y(fKj{1{%=VJRG+neO-ZOa0z=Gy+P2>Cn*vN#8eoz*`io
zM84xh>w{s!SP2xN{5kqC0aWT%{s#d#<q`HN0M=pOBW}Y11Ld`Z<WHYOr%+}KSzc9C
zQ|uSz;GM5<JD#Jt+65V9{92V{Moy5V9KlSbJGu|*lSthhp1l|&&5!oMlcI-b3F)Gz
zU@foG_pchlfJh4`h6PbMURCF5wv|;>SHjO2>o7`EKejF<ltOsW0}CCLQe@<+VHj7P
zA~4UtTv}*S;Sb8ZGW63RKLeY^8B+tUq1O7%^q#j|F<zMbURpmIBrxb^CN0ugv>cEC
zuH(zNuNMNg`FqhvbEL9Jx1wIo!+n097+;z%3tZ~dCE)-(wS2;s^2TAZA^H7an*#gu
zul+m!_l3rOl?0GNsyY_3AM8^&f@s1t{Td!<jKKw}(jlDB5}aYw+BAft;fr+<<O^q!
z<?i)ONxbRrP+1kCnpFf|QoaI`Ab6?`G&Geas|d!l=pfuAXAOWV$#G(4xQxyRll<LS
SVi;oh_@|lJD_3^}iNGN6_EiJ`