From 065a56ee4b6c920235ced8f364e98314c29b3e79 Mon Sep 17 00:00:00 2001 From: "erwin.coumans" Date: Thu, 11 Feb 2010 21:41:05 +0000 Subject: [PATCH] fix Mac OSX build --- Demos/Benchmarks/BenchmarkDemo.cpp | 2 +- Demos/Benchmarks/BenchmarkDemo.h | 6 ++++++ Demos/Benchmarks/main.cpp | 2 ++ .../testFile32Single.bullet | Bin 79836 -> 67844 bytes src/MiniCL/cl_MiniCL_Defs.h | 4 +++- src/MiniCL/cl_platform.h | 2 +- 6 files changed, 13 insertions(+), 3 deletions(-) diff --git a/Demos/Benchmarks/BenchmarkDemo.cpp b/Demos/Benchmarks/BenchmarkDemo.cpp index 5f8da2eba..a6df02973 100644 --- a/Demos/Benchmarks/BenchmarkDemo.cpp +++ b/Demos/Benchmarks/BenchmarkDemo.cpp @@ -1257,7 +1257,7 @@ btRigidBody* DemoApplication::localCreateRigidBody(float mass, const btTransform btRigidBody* body = new btRigidBody(mass,0,shape,localInertia); body->setWorldTransform(startTransform); - + body->setContactProcessingThreshold(m_defaultContactProcessingThreshold); m_dynamicsWorld->addRigidBody(body); return body; diff --git a/Demos/Benchmarks/BenchmarkDemo.h b/Demos/Benchmarks/BenchmarkDemo.h index 64d766248..3beac1cbb 100644 --- a/Demos/Benchmarks/BenchmarkDemo.h +++ b/Demos/Benchmarks/BenchmarkDemo.h @@ -40,7 +40,13 @@ class DemoApplication protected: btDynamicsWorld* m_dynamicsWorld; + btScalar m_defaultContactProcessingThreshold; + public: + DemoApplication() + :m_defaultContactProcessingThreshold(BT_LARGE_FLOAT) + { + } virtual void myinit() {} virtual btDynamicsWorld* getDynamicsWorld() { diff --git a/Demos/Benchmarks/main.cpp b/Demos/Benchmarks/main.cpp index bdaf5d219..b6b21bbaf 100644 --- a/Demos/Benchmarks/main.cpp +++ b/Demos/Benchmarks/main.cpp @@ -51,7 +51,9 @@ int main(int argc,char** argv) benchmarkDemo.initPhysics(); benchmarkDemo.getDynamicsWorld()->setDebugDrawer(&gDebugDrawer); benchmarkDemo.setDebugMode(benchmarkDemo.getDebugMode() | btIDebugDraw::DBG_NoDeactivation); + setDefaultContactProcessingThreshold(0.f); return glutmain(argc, argv,640,480,"Bullet Physics Demo. http://bulletphysics.com",&benchmarkDemo); + #else //USE_GRAPHICAL_BENCHMARK int d; diff --git a/Demos/ConvexDecompositionDemo/testFile32Single.bullet b/Demos/ConvexDecompositionDemo/testFile32Single.bullet index d69231b56c8c8e608a46396127d5168b3de72155..b946379739fca1bcdbd185eb00d3a423fe5e86e8 100644 GIT binary patch literal 67844 zcmeI5Yiu0Xb;n0C9XhfkQ+Ax#u`N-t96PFOQ;#ZX{aRAg%b}z-Ny(94;&69JjI1r;_`MoQfN%;DQhw*v&g-F@;v61fhccuA8wrr`|ss4O@y)*f7bDRrzzwvr( z8LwL%SKQ-A@j>?+-ROEl_oU}F@%-t2PlIPVZ@Kv^&uqE*=(F5zT%U+zW11(=*RFNfc>Q^wmrCii zNMd=Iv%mDxOO|;$&Uu)Zf3Kg+msfhL;nMzk(o$=g7hyi~2PT-8z@Cn*oE8@1lkJ!} z`>QrO*)s2rU%nb{`EN}y=NgPzs=Tsv%$)sIKb>ru7hyj9cSe{Otl<*owuUqK^ZD{k z6U?~=%gSjrZ`qESv%hMilWm?C$@ArZ>L+u05BKstT-sm9S=CwQg_!?~3FgF(4$fcE z6Q5Z+X3qYqpH8;S(=pBSv)b~%nqbZ~SQcNEA=@!?_E&9mvSnU``S8CPVP3F?OPJdl z&SVYu?OX|LiAodM5W$!=?RooK>A=UWEBbX;&Zr z{+yX{4VIPDX?E04`>QrO*)kVVk#Wvb!(AIQ!JOF9A=e`M8|j!i`%5pqWSNV&$T;U= zUOHlgdBGYkVQy14}19n(B@dvn?ZbFRU%_^J%qj+wK+YNL}a^CHY|o$V*{ zwH3$txgLL~LG{;hR&|zn5$2cAnPAQ}80T-AliDYl?Rd|yf7&kHx6DOEIDYy5J)HBJ z3Fcgb$+bvYSvqFU{?bb?S>{EUUwy*}^MW;8!razy2ET_Ja!oMj8Z0ZP)y!o(X3qYq zjZU_CUL?<#EB$1?ywY0@m-g3jR&|zn5$3~lCYYDNo(|4m(G#CpI%dxPs-I4_%+oQ= z^Yi(&1ryA<2Fv2BGGseu&i<;6PPWX8Fdw;Kgn7XlE@5tKID<9ZO5Fr=uE98e)f~;z zF?04;{dBU;^CEd(YW9;ky@%EB(X#le4B0O2uiEHj%Unc-Z1U&mS1S>{EU zul|Aw=3Iku{-!ypeUjOZ&a`LPKW&%pTjnAn9KU=u+{`bUV9qs|T#KZYrK4-aoc*Pj zULt#L_P^^)G0OAZ>)J0FVGb5_WbqXi;*;&@95IjmRU4hmyoJC0?>gsW-uzV)%((_* zmMX6-9bJo_?IqP?eVOdJ**vE><;n9~zur&gYb*FaL-hDN4XXe8w8a(XO=ruTVvvXV z<@Zc5=Ne3~ptZ;&OUHYL{iT;)vdl$XWK8ogciuO_oNF+-7RfA2$IRJZdg&$0ya@BF z9~faC*I-$ERf=qvFpvFJ8=Y*K7hyj1O%u$E)^N<6{dJsGon>Bx`SS1dllk&WZ#7)n zU*)TlE%PGGhreZlc?s<4;AghziO(z@GiQI*PbXXE>6qrJ;jVq#1aq#zviPbD*^ZgB zziOkCE%PGGNB+RU4gbnTx1!{PKMdxB6WZ%!wTxaxJ32k&c6khDOE0}-nHOQc_E$!j7p&nD=C+12Si{ZywF%~2gJtEknz?Mp z%-LVH(aAQ?i{$yO>-}U-&*WZexU|2Hv#PVqi!dJ<8t(J|r-7Jr4aWJK=A`yXW;L%FOfYr`|n;UMtQz_ zUE6JhIatt<#aCE}Pqw3T#60#_ZFDm87XJ2k8uBr3?lHlfYcOW1^2*ZDwdmPiQa#p} z$)20dbBa@*JiqnXellNMah%`m@pl?j|Mh8$E6khDmN~^B5A(~PGr_!Q4aa+i{pl{U z4$E9bN9=i$^DuXwG{Kx}Fu4{oT!Urhw3@eU$IRJZwb98o&x_=Fsnk#A^d45fM`M;MuPj~KU-i?; zmbr+EjA@>q&sWDxFei3&$hC<6MmlEB{?bb?S>_@xGR}FJmyeiW&NY}^i)5CiW9IBH zz4Vf0UWEDDF(b?i)^G`PTf-Tw;bvYm!JKQbtejRem+hE2`>QrO+2(nXJij&3Pv-PY z?xluH`|CKXI?KEW^O0o}%(({R{7rLG`y{g+GiU#_UAk|Xi->Uia()l@%O;p}4JOwj zX=Uk{Ir~d5y=0jeVP5(*Bg_lda0zo;!x^mMR(`_-bFRU%a$3z?wqxe(uiEHjo99LH zy!=~zWsdypsfJ7W>o}`A%e)Bl)%Q&>=NgRjH_b`ylgxH>rai;{X}fgaG8Yly_~onN zX1-y9IoDuvEs|E2j;;}N_Lp9IiR`)AfA>l;%Jbdp+Bc0b2Mao~_zDa0$#!&(n8*IA zjZS9X!r%T*Lq6us-!;LUYcOW1^2*ZDwdmPiQa#p}$)20dbBa@*Jiqm=ellNMahz}W z_&W`%|N6AW73NK6%ba46hxz5-H^H21Fu{V>B9AN`?-}-&UV6zg7jcm>&BNUJBNNQI z29s-%%(8UMoc*PjUb4)KFu(dIMwrJnSQcNEBHJa*V}I2~CtK!4m=Ar&1oNUb95ZKs z9cNW%nHOQc{Ac}SzP!>~4VU&;`RZiLya@B*zcj(T1om|BGh6h;XO@ncv%l)6lP&Xf zO!L%m*S=?hIoDuWd{u^Q$IRJZwb99zc@gF#e`ADs!5S`MZfiJ`f0ug01aq#zIDgd~ z&C)S*_E-IMvd!}%d0txWCv$oatKXw#@l_eJUD{u@(aDy%hziFq-}i8Bx`N;6@ zKL39jh&k6_oWE&KYM*4bW9ICiwoCUda}g1aU%tBi+Gk8K=Ne3|MbgUBF?05pUV6zg zFT%X^m=Wd$Yq*5Dt>FyTa4V0SV9qsIR!*y#%XZA1{Z$*CZ1cQGo|pIbl{xaWry4Hh zuj8!hEb}7FSD!S&oNF-7-!vz+PcqxlS*-!ncIm!lE+WG5%U8qAJZ*wG*I;rjl2(?E zt`T$gmtJ~_?77*0_ewF!^WE#(J|oP*f{rY{!a{tq9i1cQvA=4glbN^hx4+Ynk9qT; z3FcgbF-w(KmX5AP&-Rk)vA#_9+-#mxoU-!#@aa=i6R^3sw0mF|&YRH6-`_c~`ot^F z`yU>5?m+*e_<$H4@4oZS^CaBBAv7w#wH3ra`95ZJa`fB~jA$$xhU7}nXthJvZ?xa^ zXppJnqveCpFTZzX^W8Yp8b&_aIe=3<2lEv3Y`J-Cj2qc(x%udGv=*A{F7(Nl<|4V_ z*1ZvoLUWYRzxu(I&D(IMIhy~sbKv7Rlds$}Vh+-&2hY*`#+A*RV;`Q6#!=_nhY{)8 z6Ep|xx8fZ6T)+O@jq4N7bNuLh zbG5*2w_ZK?I%Kc*>H#{>x-FmFg3zD$8#Eb35Q-MfF@32?a?`C={l>iT>|VvVSXwQp zxV0%Xn2|%xZFr}GuP8XjSE)<+m~HXc)Se%Iy%ox9g`w&==iW$8)ez zDG-ZZ*!C-4>%d%BuSz|?QH?I`S33I+VdzGuJ{|gQW4;yvLicPu3|ZE_)YwPEig0NPdPJ%%kfV~;iTq68(=G6(m;kn^i z5AZ3iQof^&`A)6tvfJ=mK|2hZe&uNBS7-u?chG1fO64%X&S+t`PcMXk71XM@SoLtp zUyK$rjqME8oOFd<+i!Q`ffoGs(U8o=u$Ai6lGkicH5a_ln@sk0rFt?T6Ll6uZgics z#m|SMHFuua`Yq&Pb=sZZ7p)w88yM>ZEmbabs_nKtGKgY{6iPOdSGf=osCqB^?S*KF zcmnabiF4m?ES_l4CU>Wiz(E*cfHj^4-2q2d+!o_Va}=uyqQs0`lJ0!yE(%t$gk@K} zniob9j+V?*PtXGhns(53Ye$1nqz!eZgYYdRHQgUFy5*g8TNE3yx^cJO6pyTUaf$-Z zJPN&Ai*?De=xHdfh&>fwPZ&+TMfW1D;=T2QnI*G{g-+Exk5-yYLNkbXYA+>Als81F zpS+1DgQb?!=*&i`HajX#V;D4u-X!rJ=(N00`e>EWZfba5wRIF9vu@=At*nU$yH`C? zZ+2=eihXrT>&Z@GA4B>PHVxJU0%C7eyQIA-Rrt z-!=Wkpnak-is56C)*sG}BCn#{3unhz#EndPb4aa5#fx<0702&%qehPduR&{ySt0A9 z4Oyr2G~Pj8TX}NS-HVZdyuVto54+xhYL)B#8itTZxdrC^Y33W;Ft#+Bkx-L7!N$ly{ zqlHVS=jK{o8`&jUhyXjz^ttkpeW+h53vTFiqE9>(!?x2ACp=u7T7cr96MaUdh*OPT z9L{3kSDol3%+L>*a7cRB@N^9y;tL@dD3EcS@UKqG=7IjV#9*EvX(MCvA;x!cO zPP*;Tzj)wcmtmspGELqm>X?bL%QV@svdoxm(*xA6l&R!V)rgU{F2TKVMbfCoPx{&R z$xf~9i>JRj$cYAac-6ZY-_;a_G^OLZflYAVRIHI2mR>lA5+c6Fl?h!_XE_|yn?a`` zii)T_h#k5vuRku|)fV=i?$k zTvH)UqGqMX#U-sWMUKnj6OFlGA2t#_&8l)E$Fn6v#{Fnp?vFmDtva37plj;mprJm! z)SF9PQwPR$-ZZ7WoHt(6F%Pd>zjA0in7i%TRLuvQlp1+CJ#pmJCj1n%8Gi=iKlJm` zR%efMmowxHJ0s4FQ*tgta}a+%0h#O`a302$37ntBpOQ1~d~ehLIBT1}e#c$TlklH# zYR>egzjv-X|K!(0>eV(Afr? zL9Ajs&UfL@JveW}l_8wBrrM-KWrh0G|WUJ_y~XAw3k0_WV-Rx;Vva$~F^D+^F~=b07~Eiv$8cwRoEJg) zix_7D?IhYMw9{y1w3pB((WcO*G2R)pvuH1)eF^Ox+ACRpI@bOMXnhj#c@a_k zB4RLsb`tFr+G(^h+DmAYXj5p@h{YMSvuH1)eF^Ox+ACPD#wFg5W9JMw=h0?B z{cccq(PpFg4>%R*t7snD9M&_BwgB13^*6CQ?tsq)+)E9uj-4X<+tJ^S{*%zs^?RKL zS^&Q$+FNKL#%ZCo(K=|0XiI1p(JoH79eelUwU?`?*suD%YtLDeJu4>+~ewg&mBkJOIo<7!v`oD-{luFrBETbR<3kw~tw zI?^BK$E&}#pAx4;BGa0V9~X=a>h^WhbN)McY{Wp}Kl9LxCaXVe^LjI&9Z5YCZ5dB%{7>VnD+zzLVf#QdbRYQFgM#h$ja&Ws<(JktHmTzWHICW1w4Gho zhF%Y(9?8F9`O=x!=X%iN-{JcpwWxmf!SnrF#=DG*q;6imD6hI7wo|q5jhgW`*4o+q z&UHPI=&*e-CS-lX_Q8aZ{bDOh+u3z(=su8oB>#rxOJ`o6ebB0Z_&%7^x_Kl@jpLVi>)YaXVBFM=eRn z^`QK(x?K-y#)o&g`e=5)>$(rZ`W?0p!uCsbE&j9Yx;AtlNIjB&!}6u`ug^Z{cvvm_ zU`_hCKa=!xnU8(cer%6XOQJ*A2W5ZN?Rro%-sZM;cE9U$A503l9&FfkT5FS<^|{}> z>d%eRv#PdbA4vWU%a>MJpMB8dsPKKTu%v#j2a|7Vow~ir*!b=zwN9n0^5>mClJ1E< z*PrQeHRIJ^+t2L&)^#8Bo;){hGn{=~iyFuF3K?hP(sp)T8@dmq9?8F9`O=x!XCKTN z8@>;gUtT}^p!W%_<3n4Hjqi0r-S$Dv`0y@QAIAU-gtW4>Yp2Oe{gxoI2)I? zv+LT>*9ECZ@^4tabmsNh2Xm%}?}JrurjOU0Q|)V(JvKd#^-s0?>gag!vxf%P{{Lxw zc9xn}cE9WTx-kCrxpAu#rxOJ`o6eXzPbd>_PruAhA% z>%S%Ypsv@0n(^UXu0ERG@Bj2Z2-`2!wfN7n>#FNM*sy%*{Ohw1I?f8;2O}ER&+EcB ztvbXLjmO1DzBnM6u1fl0AGIH=8E<2)o!#%c?t`%V^04bc*f?8J+RmMhSikoRBTfn52W#r-dT@T1 z4yltG)%|)aXo*{p^FVe*eGxy0B_q_&(?utDk+q`p0D-$aP%~cFySAV8 zvk!Xyx@FvEIQNCqYuw|m`0KP9$822M&aP`i?-QjS$-iOw(wWz1ACxT&-v_HsuAhA{ z@r~D`=dFArdD^On>U2G*86V!|>Z95HuIqhb;*Xl^JNMa|`ygz;RM+A^%dTrf_kq+S z`8O8hk3_EGz>n(;Q)+S&d7Pw#_0 zL#`XPqO_e|S6%nPhUH6VUY~uiW>NS)Sa@Xp?1K~jyfh}S3zyv5tWNu&W_);;tB+>) zyRQ2ntl$4PUl*jF|K#gJkHz8pVEI<{vkxx0zG?E$wQb{7&0E%KAJmMmUh(i}^|KH9 zetKe!>sHwN#;|egQ`d%G4`h?O4jFkkh(s6ACxt#pM7v~^*#vtD(hq)wI8b) zZ)2_fpW6pv?;AI4U9>i-S)coJum1g`^sK6F$s_qUEMHn>efGifo5T0P>UjO^gG;Y( z8Vjxmb=n6tsP3wIhB-3l>?|)s*+K+krAc)tP z+J63bAJ{&x&-I|k^6-67_FnpU&2HDeX4zwPoV&Ko!6)$0<7q4X=emyBct0-exo9c5 z|G)RmkO=$#+75r}w0>57N&cJ~$HK0GTXqgFni9b5gnAbBMJ`sRD_g%^VV zk8u6IUnslxe`_D4Qt3HrAN(1w>zM8XjrZfio@e(r*XzQ6_d)va!C3y#|H?jK!BX+` zs;z6y{dLuGdQND(KPK$?fA@iOWqq#)qlWe$(TDN+_ntK6x%_|MH6Pi1ZL{pV{zE_d zJtjY8EPuy_yZ(sY2yFfPGurdq*J~()-6LCX7mkTgPX@2xr|Pv@dPY|KPA-A@&2jsX(m4%J`JnCvLvFYJdD?Z}fF`_ql!Jolk6+DwzCBmH1yoSH?@6*n|7*8{h6Wp8jwk4i?&W~Oy(0f??SM?hl@4w|3`JTu5 z`RVkQjUDW4(GBW%_N#k+UG+lm_Nh6Mv>x-x3+CheFHiY0Z_5$wQ%zs&<81m75Bd?6 zeDo_G^eZKH%TETn{MsMltAcpvCtqHW&)KK68|>a}1KYxOusw8y9e~mz zJ3?oW^KobB0y1Yg$9IKpup4xT-C+;t0eeDE=mouDFW4LQ0l7x?g?(W^kQ+0(;K-L$ z+yF-6&>sfCKo|srVF>IGLtz*k00+WwI0z1gLqM)shr&o01*73GI2^{n5pX0N1xLeJ z7zg9w7?=S0FcBs}0TjYym;zIw2#$qmPz=+d1WKU{j)QWjfJ&GFGhr6YhU4J`I1x^Q zli?IN73RQcFc(gTGvG{^2WP>2I2+D^b729T2j{~Dun;bUi{N6o1TKZk;Br_5SHP8U z6HIJ96S#%z>Dw_ybP=06?he1gV*5=coW`& zx8WUl7v6*S;RE;({sF7uBlstL44=TK@ELp#U%;2}6?_ffz`x*I_zu><_wWP!2y5Xd z_!)kIU*R|S9sYoS!=LaM{0(yQ%LQm7*cckZCa@_qg3X{YG=Zkj44Oj=XbG*LHEa%B zKpWT++Cn>M4;^4D*c!HhZDBju9y-Df&g&ae~g3|*ir>;k(&H`ooj!|t#L^ng7< zUjKVRZ`cd=hJBz9^aZ(S?+5)rUhw2aCI)fn4+CHz41&Qh1onraFbocW17SEE1P8+* zFai#RkuVBI!(nhZjDaKINH_|PhOsaX#=|i%0rFuYOo9R^gvl@kra}=M3)7$&rb7vo zLKz$f!P#a1-1Nx4^A%8{7_e zz@4xR?t`kr;9j^7?uQ59L3jurhDYF0sDcC}Aq9`YYkXW=<` z9$tVK;U#z(R>3RqD!c}-!yE7>yajK=JMb>N2k*lN@FDyIR>Mc|Pxu%QxGyF z!7v2&hoLYG4uAt;I2;5A!yzE=B@Ts=FbYP)VQ@H%fg|8ZI0}x2u`mwC!!a-c@?j!O zf&wUn$uI?`LJ=Gb)1VlpLkW~Z85{@YPyv-N17^Z3m<`9n32-8u1Si8Oa4O7!(_k)~ z4rjobFb~dx`EWLz1Lwj5I1kQ;3t%B!2p7S{a0y%rm%-(*2(ExD;VQTq7Q+&_2A0CL za2;F^H^7Z>6Wk29z^!l_+zxlZov;k$6cnBVbN8nMYf&?TX z1&_hw@B};wPr=jh46KA_;W>C7UVs_!vHcPvJB89KL`r;VbwWzJY(ix9}aTf$!l5_z~8^Pw+GR0>8p<@H_kg z|As%|FZdheroRDf1RFy`*aS9(Mz9$)h9=Mynn81D0WF~ww1&-L3upsdLR)AD?V$r~ z1zW>5uq|u{+e1g#0Xo5s&>41uouLbKg|VISxN zePLhN5BfnKL?H%o=nn&6APj=RFa-98p)d>%fCFJT90Ui$Aus|Cg^@4{M#EunIE;ZK z;7B+Mj)t)?4#vYVFah#mB20n;D1^x{1*Sp~91GK+7^XuBltLLC2jx%!l`sQl!Yr5# z$HNJ5BAf&#!zpko%z@KjE}RZ$z?m=)&Vu=HHkHXn33i0euoLVIU7#!M0=q&t*bTbF z?yv{+fIXon^n%{77wirDKp*G}`@(+E5Aq-iF^EHd7ytud5DbPPus;liVQ>H(2*cqZ zI2aCr5pXDsgi$aW4uivC3>*PR!clNEjD>M99*%(tkPj1K5)?ooOok~i6^h_km!TmTEMXhbQ1kcnY3|XJ92f z3(vvx@B+LDFTu;O3SNO%;Wc<2-hemZEqEK=fp_6OcppB158)rM8a{%5!pHCld2#4SWwjz>lyNeuAIj7x)!^gWur~_&59sf5G1n*@W{SHiC_z zA#4JhLL=A=8bcFk3eBK7w1Ae-3R=VFum!Y%Euk&6gZ9t?wt}r;8`u`MgYBUs>;Ro$ zN9YVY!OqYHy2387D|Cb1pgZgidq5A^6M8}~=nZ?p-mnk!fxfUW><9fI526r*IP`}B zFc1d8U>E}X!%!Fo2f%?a91enm;Sd-Bhr&o01*73GI2^{n5pX0N1xLeJ7zg9w7?=S0 zFcBs}0TjYym;zIw2#$qmPz=+d1WKU{j)QWjfJ&GFGhr6YhU4J`I1x^Qli?IN73RQc zFc(gTGvG{^2WP>2I2+D^b729T2j{~Dun;bUi{N6o1TKZk;Br_5SHP8U6HIJ96S#%z>Dw_ybP=06?he1gV*5=coW`&x8WUl7v6*S z;RE;({sF7uBlstL44=TK@ELp#U%;2}6?_ffz`x*I_zu><_wWP!2y5Xd_!)kIU*R|S z9sYoS!=LaM{0)&!IsaiJ*cckZCa@_qg3X{YG=Zkj44Oj=XbG*LHEa%BKpWT++Cn>M z4;^4D*c!HhZDBju9y-Df&g&ae~g3|*ir>;k(&H`ooj!|t#L^ng8~C-j2euovtN z`#>M)3;V);&=2w;3NeU7e;5D*VGs<4A+SFTg<)_290nCDFdmM936KvHVG~ z1NXvxa6dc%55hz6FgyZ}LKP$+2`P9C9)~C3Nq7pLhG$?UJPXgk^Y8+^2rt3QunJy* zSK&2y9o~R9;VpO@-hp@FJ$N5JfDhpxuo^ysf5OM`3498l!RPP=d~4R9me1UJJi za4Xyfx5FK9CoF@zU^(0kE8rfu7w&`m;Q@FM9)gGA5qK1;AOT58!DH|^JONL_Q}8rA z11sTKcn+S27vM#B30{U(@Cv*Nufgl^2D}Mx!Q1c-ybJHa`|tsL2>*c9@DcnIK88== zQ}_%%hcDnu_zJ#;Z{T0>Eqn)S;CuK1euTB~6Z{Onz_0Kd{0@J>zu`~#3;qWAg1-T5 z1RFy`*aS9(Mz9$)h9=Mynn81D0WF~ww1&-L3upsdLR)AD?V$r~1zW>5uq|u{+e1g# z0Xo5s&>41uouLbKg|VISxNePLhN5BfnKL?H%o z=nn&6APj=RFa-98p)d>%fCFJT90Ui$Aus|Cg^@4{M#EunIE;ZK;7B+Mj)t)?4#vYV zFah#mB20n;D1^x{1*Sp~91GK+7^XuBltLLC2jx%!l`sQl!Yr5#$HNJ5BAf&#!zpko z%z@KjE}RZ$z?m=)&Vu=HHk$7@d`~4R^fBs>%pFfwL$7^2-|m;br~Q^xeewIY%*W4{OV92P>8BrW zZJW>5XZ6C?%b&mKTief{OHcCq`$KHIe!gw<+4^j}-5+8vAGKMkaog|Y*N)uv$+snb z^T!*fUOn_%=U*Q^f4-tWsBBHL=Usnf^sVjZ3#-r9ll=bv5PL!QFOm&E`!iFYZ-?by zm!91pV*B-4J1oCnUzncVAO8GhytQq9zkV6->)G`Y+peE)hvl<+{&>4zPATacz2dsJ zlaUJ_cKx@u@U5Om-rVRy*MDnE{IMOLO@8z11)25n^IJW;UZS_d>@$-0Ot>hcZ*4z+ zE zcCPW(@9!s>-`aWmW$D{|xyD<+e?G|m^7U*!v2%^Lem|e+`~A21#LhL|`u%=Meg1le z<;ykR`u+9heQ8|wljM>6Ki-!*TlT%!yf2N*{ixh`huOR@b$*S{rN{fyxSTJl&->E2 zyuVU?Yuo&`KC8$3(zu*|S`Y6_T=Ck$HHeT10_oZ>UpValXHt$R0@_t6wCzqbiSM_<{7?=BD)wj0I zr}NQxt7q3s^yGeC>kG5}{JHehuj{Gx>UxLSetuh@)zkT@zRq9ut!?w=(zEMh*U#EE zpRKR9@w%S8FOA9jq1tTTm&W9NRo5q%p3YbGcwZWm`}Nvvn_uUn%d0!fn`&C_^TzWcR)#rU_Ox|CqzO`*WosY&_J-c4KFOA9j4Xw}GHeW71_3L_S zyxez7d#r8q+4`)W&QJAq{;F?nn=hB1T_3xC*0%XQQ@^gK#>;)F^vBvZ zpRLd8>HJh*=db$Kw)t}D+4ZsOXKkC$*2nwOxV&G}{_6dap5OL<%Z}IkH63r`?fBa6 zA2r^NSA9JnZM+??`E|UFx8v>nY&`EvWAgq;_qW*cen$Ic`)$WtzpjU`C-3ik+s~J4 zy!GpT^7Z8Xsn#p?`T25h;%C zY(HPF@z!tGo4!9R?@wi)$@PVOuAhH6oBMeE{w~y(_~82#=g*}l`oZTp8NJ~9zglh4 zm;2fX4_lwrll;NwLvFm-!S`XIw#?7ZpG%MPRzI(DdN;J`t>3?f+F|+q`mCPV!RJpI zJ%9d^&)Rhbg0`oi@5`HA13f0%9a`}NCsU(c?O*mnJVJ1n2o^T*r$!F{}b zf9LvdZOI>epORUhb?Mpl620L2zl^@MgYOTW-_~dKq#nCo!S`XA`h45w&!s2*^w*2` z0s8%~)3>(Nm#;ZKi{_bY<)J~?ho!$_4_;5A8Si| z@Ogh`ef<1Z&#sr~1>a9(^sOCyzu^42^rRlUUcvV(nfiR&=C}1(J-a`+Pu1^#oxZgt z-p`jy&#sr~`STC6{eIc{te)ie*GFu-e!gwhpa~D)|1?>08_8xAj>)J|9ZS`KR^peN!s<{?yIS+BRPeuzudUd_SY(KxP&+6&?RA1+> z`qsAja_QOivFm4To6pu)+jw11zVAo|-=Dhck+u0gB`No-x<0w|biS(3_cckmU$4!! z`E))y-s*|%uNU7pCFT8w)@N;-KbM~Rbv-q{HrwX2^;tcgpX%xSYqM?sTzYnW?D|>T z=C}3LHeT0myg_owdl#oBzIl9c;ZU7uWfI$zc2`$A4amrGCmx}F*@_ucaPWo?_!)@Su}eyXqYSAA>Se7W@O`q=few#{ejt8Kiz zPm_M|`F>LFpX5F_%;xj{q})&G`sC8n`KmtOPbB63PxY;B^Xq&x-s;));`^1P+`npl z*0%X_>8W4WQ{&~nRQh9Wo6pu~^>lu!uk%-ZYukLe^z8cB^|Q9kXY1qp#FV^W)BfuH zk)Gf7e#?&6`!yYJA8ouHulaSnjkn|N{A@h$OOx{cNcXqc!S`+M ze$V#Xj<a}7dZj);U#{`iZ_fwS)BP>BpD)*V>(_j~ zp7g`FrGB+@jkkX7m&QxI{(6e-=gT$T`t5qlHRZAPt&{Ro9v7c8FDmx=7k6@>7hE#0 zQ%vl8SI%?S9~tA1=XgSF85b6B$D^B+@sdY;Hr|d$*NvBP;wsYl0)Uu?-E@f=Txp6G~e zc~1jWQ;%F`q9nW?{>WP%Q^-9bMv#~tzY^s<3&ft%EPb6`lXNJ z7oGIz?D5tweUb6HzE$<6O(w)cJ+#VS=VXq-;+^) zEw+ufw(7-#d>Py5#f)7ezm2cO*8HlM%g)r3L$5}^f_hb7>s7l({y<;-cD&lIp61)V zn=F6l*tq~Ya6e6N$vL+k4?$ye=YX<>S;ZyA2WK^P8z?huZCW*o?4IU<+3yN)UqEmUh`+{ zpuXDd8u|VD^xtEWf0s!5t^YoeZ};vs%KiII>Nj@E+Vbxk`SG>bDWjLmj_ddwdhXwE zBERZseYM%~pnmnce~-zJ5AvyB_2Us9GS1Gw7Td;WY%^Z#i6igUBXPjtS^YG2%G$Z~ z0>9>u2l2V=IOVu{YSGtt?MKEo`dY90Yvece)zCBfRWBalA?soLVe?ykGhXX)dModX z#SfTxWL$oVeu$m&{UQ0Y^zf^lGJ3h}xQzGWt(^+|I)7(Vuhv(at@G3Ptopq9s9*Kt z5gwj?E;}XTtzJmH)}wmyZ;v0F)qi8BtnIHy$a<;1t4I7nd@egvPc8ZyU!&hfU+dNJ zHS!1g>aU?^@~fWKSDRg{p6Q>~)$`FZ;B2#ec$3Kg8DgX?#|F-h9-r`tb-4PcN69lJQng z?&oW{e{%O@zwZ8h^4EhV#pS2OufwkG{!8^;yxfob_mk+wjJ~zA@_Y4$>UsLE9#21) zyY-lM%VpbmYrA+azv^jywb@zuz4_NRUiFgN@8O>xlhyxP?Df^tdQ?AV^sJpU zep_D+yeCKWMz>&)7kIwb?cDoBDKqHa;o+m+RZjFOQY$e=3I^7r&ez zwbbMEWIy`-L^p2qt(}$M(+}12^kYH2s^{wS@>x42NA>dE^h^Zs3JmtWqGn9mbxvr`csR&V%|k3=_H zkQZM)ZNB^b`r&q8I9tZbWAojMV;^oiD(;LB`;*OMu_y7*ezl3K-|B5y*3#*n`pElE z-}-I5wGaK}!l>v!ykvsYw|dwKsbBT2-^Pd738SB-N4?J0{@8rzWyM?j)Xif_(SN_X zKUsS8+u7P*o6p8uoApWh>ry{vd^vmWmJ@cNUbXU`}4ljXPZ*0$%L z)oXTPMKp2N9`S2`>JgPal$d{+vvoh&@z&OQbbnjD#jPIB6aDtPUf}et-^N?pTR#_X z^{}gaee1XJA$Gz)|E(VNCj9quJ)FMAuR|{( zW31oCTU+z#{`Tr~dR{-AZT&Xh+Frjx^}O{A_1pLm+nq05-!)$Mqt@&8JNrM>k6u>1 zwV99ed;Q7Mv*#22$@1HHYuoe9>NOepY;^X(t&)=lT@;n|{pRgooh{GhA@8J?wb*#zMfy!Z{w}qq5PXX$$!AV z?hDnE{p0J~d^SGBt}^;rderM|J^ySz^s?fu&3qD~@AW53kA6E_*T?3w@z!QNoW91d zL(i?D_1k!Bd-+_vSD&-JeuVmMytTc4h3a|h8S1z3A-3)xjgJQVMeB98o_{tUdRg(- zWBM;>FheY4yDMI(_R8i}&>; zUTi&otsb^Lf3)8&Us$}+tFpF#K2u-T`4^I}M!c^l@nU=Z$zAIkN!G+T_5WYi}&>;UTlpI(+kE&!_Lp8t>2F>T6%vb-rBb} zUg7))9(9_F_v&%BJ%6m<##{U3jW%=olZU?&swewL>i5rY-?s4~c0%Uo>1XLtZ`S!^ z^P!g&Z*At|{9b>u^z8X#^VxW7vmQ?0TVJQIwx{RT(B`x8*7owbc&q32Bh+u>t?l*8 z#algWd;aPAxbZeV#Eu5*tNK}b%*UM{dj8pb=w-!QoB23D>#Ot6(zEBE&1d7SZO=EW z=Z%lbn%nVW4;gTkt4;mBE%9RO{?ca6yYs4G9gth(i znfjc*&Mzcijd)*A;>Ff@tGABxMf+7F-q(|OvGsgihn^c_{bBLGo>#w%_v&}H*N;$t zSbR`_CSGjTFJt@Xo44Mz`L+KUztM|Y+t;VQtn)7MHdVX2IjkmU34@F;JU#%W? z!q>Nc8y{j<8T~9h>UFlBe>NX_S@G6pJ_*yGEIoVv*nBqL+N_7u_tw|xtL^EzHMIF` zytTc2F5c>S{Rs8jcx!w8a`9HrThCCxjSsPP|7d(P*e_bIv-SM5`OwRXw>I<9{U54l z&p-N?mCwdo+n#S$&l?|=HMir%zF^uUSDX5MTjIsm^VjNm^L6^x9~STHNxay4{#re3 zd;Vy@UB0k*qgQ2Z|9qyttn)78y|)XGi0;>Z`}pO3w~fk}trBNCTgTh)o9uY& z_rBk9dM6%oW1i@j7M$X28=q^u^?Tn3s(zKPZ}a6EZ~fR=-zQUV!tW3IS^08}w|?g1 zzVFrV+v&H{*M8f4xyD;R>*4f6^b&H+=F2tS`n`Nk&+CV?z51P$_m& zt)Ka1T@UED(@%Gse|LSa#aa1sjkkV#etLQd$zk*58gKnxzO-I-Kb&pzZ)fKkZ~fR==V$renfz&7-ui2tZ##Vz zeYk3ySaiGFqO!g%?{5_oTb|3qp3iTa@z!t8&*whu>GZ!}+SqB@_*~-4ohHeass*6;0a?RV1ex6PMpy!G4j)6;YNiS^COmutNBd-
kaifeeI9UmutNBGoP&M0sT(;{kHjXjkkV#etLRtf7*Px##_Ia z&*^#naJJ2tYrOS){c`84x1OQ-a*els?5yhn_3Hjteci9l&NbfpnNQaBz@ASwU#{`i zZ_hXH{c}{#SNne1=C|Xm->c8*+0Tz`e6I1<@2#im+s}{m^9twBHQxHMv#tl!oAvpT zd|nfLo}v2d9B=iQj~lPo1Nxoy`IF6;YrOT_^V8Ey1nZlXFV}eM_wqSCuOH5~`Erf7 zey?Auuj{F{_TSmL##=vj*7-@j?(-r2{K?y|s=v+6B6D~>QusYxjyHv7&>Wh)wPQbiL{dxAI`Ui|Ez>_D z{YUmcat+Vbzj5H3{OqEWDYGW&9<>Uaji5(Q|oUthh5Osm1Qoe_3Ma>}AgGefZ^hk<(}N z>w0Sk_xdXKs*ar#onP(d>|4(N@zGS9zpL6TsdD`nTk<`6!w#A8Jr*xZ%o*{Eo3GSU zHneSG;jO96_*8UM)uNrZ&ge~;w=5BP=QB56`<+@;KmA@cV%_~#zxI2<(xJ(YJ6s!$ zwS36^{rp`gEQ=n|V_Bm6#Pr|SFaGB~=oUNl(6^jl>=tK^j5UAf@+#@)`&)O4E$p@| zar5#;&R#h-nTXuhE@LmhhQ4+$>!*H+UsZZmRPB{l-Wgpw__;jIH|M3F`W>-gSz<qnYyMVS$L2gRvP$jV_g5u4zVcVbj*R)V-<%oC66$aBH0${Hju}1e z_ng-C)9>ZGuDjpr*M9#ngg(C2E%wC~L*0IOegDg=9$zprV{iJ%qN@1Bv!dSw{+GtQ znm3{4b9tNHa;Mu*VtG6+r+AeQc?AH?Yk^-Qm0Ny zu~#>IC~y82*Jku3K5{}yzY#ZeaDIvJxK-!Gy)SfgcGs0Z_LKPG*X)q7Bb`T8b=_g> zjNSfp@^|~}QPG$26B_+pwf2@OmtXtcs!jd$d&05n?zj52-?v;cH1-AkWWTxnEB4{^ zpZ)CmCH9r4xc%(>sV<$8v-`OH?CdXYO+_cf+sb~<#P@0A&KDQIX4bMqob_P;I{T8_ z>Epr@+3#+AlJRls()zdwlRjg@o#+8GRuGOuH9lkyw}U^pOc=Q z9Ti*S?|8YHvwQS>!Oeg2%Qr=R{qt8hPx$e@?{62qY3;VLRc|hE+!8mxR@1h1=i8d=XS@07 zc=1dBd|T$<=J{T(-?uDm=jNLlcV0i~x9T<7IsN~4wBNLa>!*(Icv~~4-|?Xr-1xlr z8@v83yejVWbbn3gS3mt)IBwnjQor_V!q1CcKRUgb-aqpm>EilT{#SZ`bsv@P*Zo_k z_n+9(kE!>k_mkMtFCD++!E`^>elC%o|I+ayvre`)k6Q{`GP{HRr3ej;y6T?D?pE?bjZomLy(hzGZ)<_Y?h!UBv!U`^pDr zNAIIQYRh=Bi|j#y-yO&T)sKuUvzqxJkvNK`d`e;-d_t#>SuqI6=(0SR_V66>z6Eu`lVmuTl-f$ z7N53xqRruPcYP9j!k-UREgUr1oquAtnjDX|4gAZm8kCgr*4FVy{G(fP&OP~g>X&%2 z`^?`hqu1k(*+?%{M=PwD`4sW`hTR({x|27NL{nqhn4{f?#QpWr79k+>RY|ZEAPc3|~N^Q~iZ5c1N z>W%oePb@P0js1pyo9@4i_igp-c8u7qM3}A6K_$ ztDm}){&=-@yx6Pguk=~;#E!5YvJPUiPR_66S(ljaS6lrO--`87TkBO@{8F#hN8e+S z1K!xr^;z--wm;tYYyVSM)=&SJH(Gc9)vx`hu2``DT))H)_Pev0m!2Qa-W`9i|6D)S zFMW~z(r35-UEi@~d~iNEKkE_;_P^89@viT|_~3kUeu!;KAZ0+Z&H|yvAW8w7d{cQWGe(fiHi$x~3O1L`dFMW&kC>;(|EPjPv2s#?kLLAU;WiRRXSeu#n$okF&TNQ zWk2<+t$yui{O9`V=jxNz-B0yvKc%h_^h@`n*sJqfW%j4k>D%I8%KUUciQkWR^LnQ! zvp+Rn$GbjwezAMdPu-82U&l+lpD!KXGP6I^`KoR0=ZJ>&bG}Dz&hBRm*AWAe9dkhpDY{ODZ$^vcFr4m3c3uzfEo(@9GgdMSrgTerGoyv6s>h&!4om#BWv|pA_4RPsUk~ zL3_2x=ovdXf%WM;xnCy#9M)s$L3?Lxt7qy+Y}m zwZE5ad`xWhq8`x^!Tu9_M4wIxwOd`jbJDkUy!2g82lcD1@oGQ#Zu4aP)J~cGuD0qg zPxXr}Z9OrwpRc@k&sgfFahZBVKYqD8A2RvG*7z^_(AV>u%l>tKwbifvUEQjFt`AEK z*WF+BYk#G#IQ^8qNWaAHNc}P|wb#&p&!4omiBF2{#V6;`U+Jsr89TY0{z{+Kzl#1! zpVhW{roLq4yylO(z7pX2?AhAijnej4zwdqq*`laJVU)D!$PtV1B{*0dVSM{WxKtCq^r>`;TulhaP`7`|u zzL)u*exEjHWcL2GpJ%9F`YXN>o1Go~>72f?(`WwfKEJ!}-o>%h9-HQ=z54xEl54Np zKdH9(W&FPTZ|Uw=yWYGww(`#>q7%B!a`O>?q;Idp_`v@Cr8AP9U#N~RUA#D!ykgf_ z!P4$-eDAR@CF7I+NL>5WQ!anc_uD&t&G+1r7n8r9^G-tTAy=jA(eZQdofn%ketIVV z4U6W-R^Rb=mF7S8`ZtsP4(pJqfAvxG^9C;6H8WrB|EiPgXMZmbzQ>TYmxt}Y`nCTP z-*`Ro`<(Z%>xbC$+ct}yw(6mz#EX5(F5Q!RPd+r`zpDG_*mJXfbN%}D&og4H z#$H&Zh`6YhM7U}!(?Jk>X^JzAgUq``qu&2k|dj-Z;7GxaZw`#qNF6KFQZN zsc`nl$#42dM~r+fPxLF=uZ*4VCTON#dnn>X-PSe=h%B)%|t)I^M4*=&#f3UEN<7ul-#e zuc!W=k)ywXU;BIM^-bOW^5*CEuiEO@`7nRyS9?yIclQhSvzw2M_xpX%H_3!=OT6Dt z8SmTbSN$VKK3662>~GgU9j|_|{r>j*a+gG~f3y0#ylMUPH}zJI`|rSS`%AqsdHweK zmu1s$SFhJk=lA;Qt}i-&9WS=F|NCs)W6R^}J9{;d#uj)HBhR zaf#C3tCQcOOaG2s?Xfbx`jH;@eE*j5F5@C8{rwXCy|KFL@%uk{GpKLJc*~UJ(%*}! ztKO^8mZ@{lqds@N(ck;2s~*2E65V6wRgdudA8vj1_gdgYJ1gS+d9elJs3J<-_`J*`i_m#C}WH?2Cv6OG5k_45qsB37EN?_VhpwyM`CU4sPHI$LpMLIIS3T;Bors?3N`3k{V_o&oiHn}-ik^P1 zR#!bfZ%OVuYo&a?;jS+ogU^xbs>kOI(eqZmk>vA&^!^Jz7pbcr?`M-e&smk^{c=*~ ztMBvcs>l1Wn9P^=S58mgx7JmU_YcWG*S3x8{g}QFtE(RO&#LG8r|&!Js>l6HEU3@v z>3w!R=(+yseWmJ+8gy{~gZm#e_$=0H`Y{znClvByQhr(fq@v2>BfCyNrXasEUk;TP z7Z+6&m6nW}nqO8};U76<;<1I3D$|EbDk{tKi%PI|om^C2Q5o5_IG;bKA2YeQG{3Uq z=-%UaURZo|FZnq!zoJOOO3RC;6qQJ_85M=)BT9)cEa!NIq#AvEnUqwPUru~#cB;KrM&zSDF?Z|s)N2{lOBt|(^Ysv1#RQB;X+|MK$u<407= z+-e>lmG1q_{Nfpf5n3Sqm|0j}Sv0AzqSxdst3a%xk^<-I=^17&bw@=K-^ zyLG}mJdlx*(+ex6j>s>stVq{Uk!cv?4pJW~GS1Cta{eS)0M@mnVlw>{kx5gFiVNI4 z@l+eZTDb#3*RlquQ<7+4CSKY%qpbgIw-KhW8u^ndN6nb%l!%>CA_W!}xJ^+pL^hF# z)bI={oiVYvFr$B1Rv0OQ?bAyZo#2V(rTGPAQ}Zhdhvt_Q6c@TVW$kb|QeIkGIk3i2 z*`w(#U%gXjm6jJ5jLvjO7Kgo1R$81d%RXkE-r+?hh56-&7qTPdlrypYOQy^y&T{9M z6jhW~mY0?lO&U^OG)WT3B9xX?(z+4lrEHf9PJz)=%UQwF;sTrng}91lx?)DN$2l~) zI+SshMU^uGp{YfcL&{}%T6R*ws9A+&m7~h07M2%|%xw5c1qYSN5I+m;>|aZ5!L?&Z zasCup@S+M%&VteTQ}%R~v*;yg4UOwN+l=A$U>9q=; zQTC+5;=*#*VOO%I9xhiUj#QRb<`)ksEl;0IVvH^=KaMk9=ErGXQFu^(h4dy}-JtyG zW$Ei!P@H#w3!$_=zc@ISDN8PqX-|4j1^&z$jXF-|QavizTN^eklPz87sN%vxsWg*B zGNk(%>dKT@Jt4Us$d%c>aEvUSRS_wfG0~lW6Z@xs3=q*WF4Tnu>6s0iUN)n+LYfyG z4yFEwbz4S*WR*sl@d_~cuic!Z`R2EK;3}@;Ccoo8NIQLMc<-OcXoZAVR zL+RJH;MhU=mE}dVd(F-om^qj=H1m4oYi15+4b5!S>U)=om2v?tnlwW0qx{1(DfDKC zx#?|ANkQ;RF|qQX8O4=F=~oY5ggc92B?X1EgISG|mYQRFGonM7x7-2BVMZ2~Pv*WP z@agT2`1~vbOQ)BW&L~OWsknQNARx=3$Bt*u6%>|d3FMbm%qY&9{{EaDye!mAC0!Xh zqu9Isn^=AK5WFzCeWCgE&LZve7ilE-!*Z24KJ=hjIlXcYE16unCmTsFVg=PZImnig z3~aY8d%8cX$NK3)2V|ul%4+zRFMo2z=L?graI~EB)p>)O_Alh+x@gkggGwjY@Qo@i zVr|S}IX{OFKDYs&;BLf!4TJyqn3nJ1dqAs5M}AI-#3OTf-iQC%M25OiUGemZjNs2W z{|)8Y+YL5ru%^K+8*j$=2;-MV=5r*{plgF)u}6&_IdErwHi>LZd;}Uq8k4grwj681 zktUH%`2U?Z;`pY}h~FP>z@MA(y;}qR+>HO%xdF!-Q%M7kHIB4qY)hh=qp~^ATk*UF z&$mFYF-i^HZy>jz=1n-(5~~%oMsss2*dnrJ*6}tR-;$WN{I?O~+F`fn&xRcBz_G1( zwl#4rINE^c+i+C6wk>RfcT-}v!@E8Hj`((9OeffpsD}7E9qHoo z%CT)Z);iLaF+FbE$ZkCA?#6D<{G_Iak=>nEM`Q00%uBRo&gpsWK{cDW zxaO>Bi^!hD_awd-6}G2eyqmoE(kF(TE(4$kB)#jmXi69F211*om2SjvUA; z4@c)9I2aCr5pXDsgi$aW4nyy77z0PZk#H0o4P#*(jHmWvSgp47=RmqRoE{tm2g4yS z0uF_dFbYP)Vf5l~7z0PZk#H0o4P#*(q;+MzyRdT_a<(*#w Y)OjY%W5;HXYs9!ljBCWWM&7vp1Nu+Ur2qf` diff --git a/src/MiniCL/cl_MiniCL_Defs.h b/src/MiniCL/cl_MiniCL_Defs.h index 437676cd0..c79142db2 100644 --- a/src/MiniCL/cl_MiniCL_Defs.h +++ b/src/MiniCL/cl_MiniCL_Defs.h @@ -260,4 +260,6 @@ static uint4 operator-(const uint4& a,const uint4& b) #define as_int(a) (*((int*)&(a))) extern "C" int gMiniCLNumOutstandingTasks; -// extern "C" void __kernel_func(); \ +// extern "C" void __kernel_func(); + + diff --git a/src/MiniCL/cl_platform.h b/src/MiniCL/cl_platform.h index 31343da7c..ae2c71b6a 100644 --- a/src/MiniCL/cl_platform.h +++ b/src/MiniCL/cl_platform.h @@ -31,7 +31,7 @@ struct MiniCLKernelDesc MiniCLKernelDesc(void* pCode, char* pName); }; -#define MINICL_REGISTER(__kernel_func) static MiniCLKernelDesc __kernel_func##Desc(__kernel_func, #__kernel_func); +#define MINICL_REGISTER(__kernel_func) static MiniCLKernelDesc __kernel_func##Desc((void*)__kernel_func, #__kernel_func); #ifdef __APPLE__