From a5d156360957a2f7ed720aae331d45327baa3d8c Mon Sep 17 00:00:00 2001 From: Changkun Ou Date: Sun, 15 Mar 2020 15:30:48 +0100 Subject: [PATCH] book: fix a chunk of english typos Fixes #87 --- assets/figures/pointers1_en.png | Bin 0 -> 26409 bytes book/en-us/00-preface.md | 2 +- book/en-us/01-intro.md | 4 +++- book/en-us/02-usability.md | 12 ++++++------ book/en-us/03-runtime.md | 12 ++++++------ book/en-us/04-containers.md | 2 +- book/en-us/05-pointers.md | 14 +++++++------- book/en-us/07-thread.md | 8 ++++---- book/zh-cn/07-thread.md | 2 +- code/5/5.2.unique.ptr.cpp | 4 ++-- code/5/5.3.weak.ptr.cpp | 4 ++-- exercises/7/7.1/thread_pool.hpp | 2 +- 12 files changed, 34 insertions(+), 32 deletions(-) create mode 100644 assets/figures/pointers1_en.png diff --git a/assets/figures/pointers1_en.png b/assets/figures/pointers1_en.png new file mode 100644 index 0000000000000000000000000000000000000000..6a96338fec99c57d700da6fa7ade59827705a752 GIT binary patch literal 26409 zcmeFZcRbep-#&h}O9@#es}m`+l)Z|xWJR(I*_-T5OBo@A3K^x$Y?4(PsHCinP$8SL zx8HGI*XO!F_x-!?@Avok{rP=7z8S!-uZ02ZUF5qc@8OI3(DOu0U#-_IB zuIwh}mevl^#L4n%BD=MjG*L%b^@!?ad2=i4Gv3bT=e^HrntI!siklH-WhkUPC2#|K zb5~<_PkTED7YR>k;$Qcbz|Z851&Qo`o#JXMP1IFYXP0+$HfI+W5EeK>l%ZgkayGM& z&>)@u*TwivnrP+fdRanH(8I$+z~h*JqqC*pQE_o`!6QO~LPGpFgWtu=!PVH4-@%20 ze2c&DK{9tSb+*3jYVGL2PQItHiKCmVG?9qo?EkvCtF^_y@9yC8uh&OM2$GKo9u+tu z_@7TV_q6_BoK8OS-%h`5<>>0@V&!=GKVIO!JmNnN|F;X#egE?%p2nB|r;}Ax|M#cc z+y9r>aB)55j*j?Or~a2V{qq19O|Q%5f*R&7j&9DT=BM1v9b7s7>IrhcNXR?dUv@Tk zaY4^Y6NUf%xuU(XrMZf^gQcsLG*L+W*#GN@jMBns_5Wq?u_UCbC%G*&muR_&W(JrmV-53=|3IP{r554_{b4VF7m+t)qcJI z`51W+CDg4w&Fyqa*7oKOf4|>9&HeXLz5jIdpSS$$sJx?{qw{$z8S{VMEFY4+1b&|&D7lNuMWoT{yysBXyNK% z>}-D05(6wvJZWKJjWP0K|7&E~51lqQVHXl%C%?(z|9YW^l{x0Z|N0dL|J6W2@}mBy zg;Ik5?H#24I^jP>0bKX@XNWEcQ-c2yr|`>vL^^W^gg0lzu^N7+Sj5V!))<}tHYx~7YEd}_T6fzQ zioXk9%F2!*Y7`XY9TXW7Z&V30`!xP-x~$iyak$6j)&37QFSNdF^8O_9$n=1@h5OkI z@0wdlTlI(4g+J^KC)M07p1&aFP%+_b8zVcP+j=l6cI!i%9|sza*#B_)@w>qOc?H+E zZ1a{Izk@G7Jo^qB1mzvO+-=?OZy)7hn$8f9p?xs_0-36&C{*7vDoL=>~CeNE_7Z_h}cxSD6zSBQ^KIq;-cSP zPg=i6kGIUdtls*Rk&C~I(sJ~(vt#;`C62{6l^Jvu%<`*z#|=(4_@-FC^$VY1FX1tA z+aX#0`M}`n&R(S!%MJ_e%lDCxc3eKA=RzP*8I%9pkS_bwnm}MDD3VTUdM1o@`&X4Nr`QIxq6y^gjkWQaIO(InUswZEg;W&Nc=1m*P5Ydf{F(oa1p%jGg{60?nnj{iQ zMdjm#?OR&jzIoHq$GM3yM!RM5pTl%CUOqnSb6t*(5_IZ}%*@&2)IEF`H64vAtJ4XD zo`W-i0@bhhGxyR&LRaJgo-olcSiRPzjR#xd(uU;+byC%VR?AS3P zktiT=mM6x2=yQruwSUfq(l&Q>0wI}Y_E_KpA@lc7RO5rr=;(Z{t4n|W-1F-*0~#6{ zg>dFCtvN}K`+AC6T3Q4QUT|`8?c2Mz&a9x)XWoBl`041^+$1rl)Drnk1Ok8hElMw+ zxv`ES>*%<+uNmi`QtaFr8WQsCVws7fW58H@{`2Qz_6pnFS_{lS+>rZG<}w%(8tUTW zBI?+~N4@=^>H|7@`n2)S1j31(BgPbND+^9U{W53s`HAjRL>ii6`!4sE^m8QF*%2-N zZQI;p^Yj1QKW6Fc>pL?u!^g*m>x;}kFc9@CJoEo)&*7Gl)-1d`T2(K2n2)dG@{f%) z^#ji1Z@0L0rJs9bXJ^+EcYE*Anw}mR5#$km)eGk~5U!N8ybeG4>(?(5-TwVP6W_}4 zmc12T(@V3XX=!Pl;X6l4MC>~?b%}Ho(o#~a(%yIP-5VMjN{_)DJaGX{k4Z>iW@2L6 zzu(r%YG`0!U}QwXtnQ9N1Z$2#xpr5|Nfrwm8-1^o;NTrJ1HXP%%>qT9_<-w#J%4{+ zSXej}%D}H*R99CQ#J@63P!Hb+oXTU*=Lw<0X8 zVK6D+)1VsZ?t=%JZ_|@m+e;md0=b5VhvNi|+M1hP+}v7~&fua`v;2W3Ebj)Ky}Z1{ ztAAt8bd@@C69eT^itCcYL&L(f9CvCTqB~~sQT-4d?Lif*&&gLAHeqaY(j6(i!uE?g zv}U$q=Dctn7P4zU5-8_1JJPyo+wLOAUYUaj4+;r2b$3^KO!jo{rX69$T+%DFU=eqI z^Yv?KMTHa(&q!ynt?Gm0uadVC2KRSD8-{n2U;-7nIzvbs`F?PN(@ zYTLb=KoHDjeWI??_m2FY*;Q}q>b6JM)Yvw)w$A?k{n?!k&+(fT3EX&PDdq8F5;2lG zGAu0Y1Uox1ysx03An42?x~bNWLihP(Ws`!kv$K_yl|Q_Hzl)M`)JSa|C#0qlubxmh z&h{lnDWz@MvgNURs-e9sQ{;yM3s+Fa=V8O}`SL(ktYj20TdzA2aT zn^HkR)BeWWw{J)K&g=}7;~;-Mda!Dxq@=WmmX>nYE@o!t_IA&8z1bfj+pc(zp_@(e zb@>=9EiDVV<|lhCm8GPm7xm)LCdu$KgkC7JO3~yIb@+COAyntt#f-}IUQFP<`MTLM zSLr8zHN=kanLQgfQUWUtX2;n5eLj%60tn^Q}q# z0;ZmS{rKyen)ZESeoHg)w?_jQ1TNy<9^;)_Uaijz%HP;z=j5oWsGt!6ivx_|eK!3= zaRLSfrKOI|PgJwCb3`0_E^;hqm*0`wa3bejY4vn(E*fS`)zsWP*hZqq7IA|8$gyJ>Uy~?yU{Mxl^$;rt^0jtG`ioykrFLoZL zBed91G9CXtKhK?dfq0Bg^m4!dou5A=K z^(&l3($M1F9~+Z&nW(skJiq0+bLY<0MzF1;UlDqaIeZf%dK*({EoN(bJ*1_j4IWyZ z@1>%owC^b3s;*d?*Yc9h^<~Y}d+T&DEZ|M6JjE75u|Wi@bWo6A?+3F2tS{;>si#7N z4oOHn2zvki{o2a3+S0t;=dsX^-d-a;$uVmi6dzVUP;bnb&{p;7JcyhKS zJx$uvr`xt}y?OJdg@uLx%AeY^XV3QZ^js))(Bg^F+UowJCUAYZdfoQxv&2V_`aY+~ za}bFSbyU{TLYH43olu54Iqf@Y@`f#7(;GXg_LI>N{PGtQqj@Tp`waFgv;L-8)WqPQY)Si$Sx9-$1m$2=>s-3@{h_oE<_rTfvz@iIxa-ho z1gmrfF-((u-EWT+B3|F3vb{^Oci+DJ<eyL^s z`n4op<+)SekJq;$ zF0yX^{^~lqst0kOa=%D=M8)ch=Zrfj$Y0(+EYu4}=B;ykC!e)tmOow1tzIJ%(PQ^j z+{ZhGi8jqo8pgXygU|3Wd@vJg3$eU(i9Pa+Sono}lPxqIU0q!r9bx;9y{oSe4yvfE zq^HqNyWb;&Os8F780d~#1@eEbD}f0why7{JbqPWXJ8cG(4 znPxTFaYO`~h6M5RX&PGoKLFX<9sKucvMt$kb~{G6?LuCPDTMv;u^nQPsRN{F`1K2PEItz zq_K+b7jB__Vr@ZfWiFQPd}$gTRenCirM?K+1$o+YNiu%AVPEbXkiV3tEiO-12P}`5 zW*fB>+kVa5b-QxQnkM(bgHO`Z@&oQ*-17sd0Xr%xDrRO}8TLy~BVcuObc~7aqQS%~ zd;XmI9Hzmtf@uW{P>zO~S%ri}y}CSanf2+R^arN|r8Fk=CQTTNq&uRmp`jtE$a&yB zqyKZk9fvjfwW`&8R{cGSwY#OqeYI+_taPc`5OEICQHY9)5??s=ZC&0lqQKW9+o z>$NyFfUIn$CcEU5*5ax9;?bN}{Qr|e!T8mxo}pIAAXFQvWySsEGr&f=p+ zHB~xMQBm!kc#SO0OaQdlt6E8NIeLYsQ`C_RRPG(Q8U)Cz<7GNaH&P$XO)_(Eco-Y| z&gr6|VGp8LIGe1Y`2IsYJSIlZRt~(2U~Am1ud90~MyW%m1tCzAN9)|V$ntVYno|l2 zF3hz}PY`_%(^14IVd$RWp|S{SePaG2{IS~3jT(oDFFgO4czb(0I5>EFOI#?hZhivP zbo=%$?LY=<>ST?Kg2F;QHnG@q`8>?~_wNrT5#v5|=uBb_X!696h}K`9vCt&S_&xBM z3!C`)Gb%DNMI&QDsXR_GMVJ2T(3eMxE@w#GXA{yZ(lmL0zW4OOqc)8EKK-WF< z6}~_rQPFCTN!F+CWj$psxB8wtRxREP`u6SHLn*IRjSPhS`Zn!oIjwg+J~5Nm>_4O2 z!rH}}&(O^5D72*g(voq$Lw0+4-q)N9wI!B1>>pIMc<6mzxR2|{C~4{IkBp8glaSmK z^xv1ejkaNuqNc(;jTOl+T6=YU8;NsIFsrQpM``60z()W(@o-bw*r1@qSpEwo)RDJt zDOgw>taVzRpTwj|I&K{$mm-D%rV*Er_%$$qM%2}vAx_QD>+r;kDgBMMm*1Iec@`hvg$(J?Q&GRaw(sio1=p=?OJVmt5yNw(X@b( zmW&u)oq|ugE25Pz0R99nlw<>C0nt$H+-bV{llS=5+3_wNcIu&#kxaHfYpcuT_eLn( zvhiwQ;Ffica;8mNcTrOW5+e_>vtJ1!~uT zCUs;^4!^Q)>wa3VrKKe{-`}rL?#y^0E2R|h?HEAGm zqNYIc2{?>Vi;ayntoAopmCEbPrWm|h+_!DZmV8bbF)=X!FC;Iylsg8OWMpKlt*v+L z*kN}aBRnuTc;Ui@P*N&ZH?rL>R;h)tjzRzlY44fzj33-b1OThuH(pIvOOiQy^eC31 znCEYH>Cx%_zCL-9<);MWQzBUg-^Inm^0t8}8oR2IaaSoV+h!0+N4xi4?xgX;hP3wU zJk>tP{-`jX+jog%Xp%uuiFwQ>A!)BEGoaQn0oQO0@DdA^Vi^DsoSV_>@RIazmGg^F*!Q9hAU6&lR`dz zRJm}W3$t{xdfgv%3QC>Opdj|tyeczj0BfI_e z&CMLCK&WbdWlK~$Bqb%~<>lw@g(*j2$*0I~n;l>L6!h4gb%Ew-yVoTxZC~Y7^+Wy5 z>~rTPu=K#ojFcmRyScfAg@ov%yt;~NgH;M7#>r#H3g3n@W+f$ky{dnRkiJRxez{ZM zX$)7nhhtUlR+?3GclP*o;r)MH-ICTwn(L`Rh-Q8q?i1hcr#z`)F~&L>J1K0s$A57k z4oHAm+}TWDzZ1B;W3RH-6ZJyN#vY`RZ)GmWgoIL4Q*|vLQTY6dNUz$~wnYq;&SdI` z(kadBj?8Ag2qZ!4*L+z81#{7#hebu_fB$$*%YBwJwKYp;n*Xqr3{{__bl>tOn#imy zUfU;FUm;6n=G|o~s;XcM9^Sj>iHamI?}&mzEiTKucuVJpJI`#Mo*<>j*DX~mwF)T_^GKGh2U&@`}p?k%-=;I$p8r25Z#F2laZ0p>%Yu@;n|wrbjE?Kwf?xmPD%gYyE8PGqG+ZT zeB*i*&3&s(E?uJDvqz4EvLke9*d*9(3-C^MQX6Qo7EuJw#zp(~t-JOozX81kZp+U{ zJMm+B(zaRC{OOk?@xkduMKdVc{`~nPbpJN}?r3hcPYa^4g6R5*u2Mk`4pX!cwG}T9 z4_<^dfTPA%4%MaGm8A-am57DYVN8olO9k4QfckOFp$P*L$TP=9MHxfiV!#qmB4Gvy zQwE#wmG+r)y?psjy;=6*Jm=_rKqQnkpfvdy7#SIpq^Yhw%N!_BXRASemp{*So z6;JT@@EMZJCNuDy9)(-zv5we!3B0O|x*6HVs z($aYp$hwZ)?rK-U!*~0{b8&H@LwXMw`J8N=>O(+8{YvI8g@tEp*#bCIQ{->y>*>)% zR#mO_*GCWQ&DP)8L90tNF*BoMVp1Z3A}B?cEh<`B=!;+!xLB82toynd7kx^S&DG?g zVv%@kcs(jHvC{UdKwE(FsuWht6)n#dRLxs#KpeC$=KlUsaLn4#vGs)w{6ZnWlkqT^vLpAkNOs*UlzNgHXMHmLL#?z$o@;x^fnm^ps- zQ&rl6@q3VFKl}Q49kY89FQ#dzCQ8I4-lCFSxihY36yURT+V@_P(MipCc#$20!jvJ&DmVz+o(AZ-vvi=Fj-ijMO~$M_UtcF_4Qw8m6U$QB}ur2q;0RNs^YUmIx|Te;M%hTx%r{_UcNnT zi3zzwnV$>S$|tK#lQ#O;O2yJ>r0qY3a-_ZXD`00ZEq4fsSoI>@r!CPJZ@n^SXRo5N ztJVn=;fgxT2#rlkVnR^W;;(ofpSy*{sOMLr?%t)Fqxv~A@_y~)0}=ZN4<9~TQ_P>} zXRZZ0FSL?$8+lWZAmg``=d(l4{vsBBD^;ogs<-TLl0zf^C1m@ll{=&L|Ku zw{G5?+A@lcM~5#wVUAIXxp%J}We6IrtFMpB1BgRcO)WP$`NY9!Kh#X%8TQ#8JjBcE z10`X!E$8~RYr6Dj^!1tIFFf#@&2({cvPP|T^5iS9CO4_rSXo&g#>ewgZ{N6aBTvgx zkzGdt$Q{)ApFVt8{(hYbT#?bmi`kDJHRl>tH#Ie(x<#wDZQE8T8UxxrH+OPi;B8eW zFlD^3t+s|nYF3scbcZcF8O$s!P~U1z=osqi-a}>u=oZOrMz{s)Ew%4@xAau!PINR! zZb2*V-y`TnHAH4^Cqj79jvW0GxYOfI@BtIMtS}V1OzUQ&aGe!1}WGoyV)V z$cqKx8d*b8QE~U~-2fN&kS=Vy(GoT(&m%PS^z>eyp4mp#RTxy%3|(F2Ku(yd;9EQw ze*Zx5UAU8Ke{2i2qYYQL_Yo+4)yWSybm;rvXRn{N3w?Rh^y;e*x!H8?gh z(wTg66S6YYlHXtVW?d$xg1adP&|h2x038|~EqpQv)?H1l5kMZ}siC72cS`q1v)97! zloRY$t18QL;{bf^7*7<^Kx#Y}(lGP8fW$%dRK>J?`yvSasd@)@nIl`eyyAYU;E8h!)))W+FaXsPD@Xb5-&eSikLPukaXOJVaO!Tv{AVl9rZ6hB4ysiT*HPXG8Oj%==B96 z6sDJ|u7Qo>=HtuG%e(yU_C5gLZ0F~T4>a`kAKbYEqOs@Of$w2*sJLI+8b`BXMp{eW z@eZdvx%edCDGQOP=hKhmvt+W~?F#6KN*@nkM)gB>T_xjK(~D(A?RO6&Y-2^C>I0pG zlK49>6^MueEM&l|_KuFlg#}j>+co3*0E=Wv#$)o~ty{H-8%d&x7ZnxjA;3bYnECxf z-os-aAV0$GczCdLzrvM&ya2(*(FqWALAK9M_9lh(DL_jZ0U$(a_PMon{A(`T{?Uk> z7vOOLOu5+8U-R<^pRs0bincIb;Ks&0BB+AAKg=8JbxIS65QdVb!q zHItq!ayoo_e$L1!09}QllEFFGw^DAUWP0=N_Ce@pKoxGdCl)L2$)oT|(_?LA5jU3h z{GE)@1i}LA$Nc=0x`8Roe1kG)t^)^Ny?T{`I3j;@mvP^GQB1n5Ep&A*x zzyjh3dUYU}RK1}NV&&(ncGGcgk zok^kS%veWs!y%AX7L5-ZwDbQwQM8{3#k4_blo{uV9@RQT$4o|0!9ggXYY*}m+af`? zcT#|h2Q!dS#fHI4Pd|j9Jl>gBwF1_#@8RsjVPHIOO*{HpCrpt`lh;3C4X_gBshsCa?e{d2Oi zvPeW@LCffu>0od)Q6dDE_51qy@oxL5oiF+}sU00wSd8+`;{5sPEaXTXFK#>L%RN9d zdW@y$*+QwwZjWBbSWnfGEaaa}`*Zh-tuU-A3 zGie%uH*SDMv4m&CcgsrzUZC1AZE9zB{5WI(@h0nrf%(-_;e}a< zU?>G87}R|`ogL{e5Kr>S>!3qolv=9;)^TqEI;1+0-6W0TsckvLw)M>X+WAWl*uPgong$N{w1ECQSli$jw(Gl&g7SL;1C0woK zrlJGk6kUT@ zDM&?@Luuza16=^xll!d)aN&f{sd{3o&kNdEw+lUAE1jEhJI+#YD4#maA2wo8pR5a!m7JI%R^g8xb9NrV$-eSih;kteM zcF(E)dJqbWi~yQv9~{pBA)Q^LXn;uqsIfk|zBUPog3KaD|3OEe@r%b260!RHvZm%* z!-=@)XnB&y#JBo}2Ch_8PdJc_nB01t6BvRTyw4~g5SHrl?5GD80v_Jg-VPlPxdIsg z1Us3QAyd^eDEL=aeAfnmqRA0l{g9bsMU5VP=v#6GtE%#k7qQpf`dVT(NjAWcCkFbR zMO(I>-LGOibPr9IpsTyP#jy-XQd)IBEnzSob$54zm>}n>k4PG6Po6x4gb{=)3jT{` zAY;@>%4tnd12sL%bong!%TN>mWRJ+JG$hIPLdLAE9h~ScA2a-L=MMGN6Q8jzPhQ`O zg!>Q;$j~g{dGYzP`uX$cp_qs??#ePSojw6Df_&dwS9eHE>|XUqa=15qcUI)Dp$ppw zR2TYRZX)XEo1~X)x*G86)E2>rzUN3t#0N5dFTAPl!3*WW%uT%=sSu8=5`aOaG>x{- z8i&9>$8H-i*gl^Td?+Lbc^y$9jg5`L#9=O^7iiBa<6GBRC*eBuGIsC&{bcM9zLoE) zCu_d$N7g*YpCF-$N@{AB5xlOafS-S|LBF5z61}FF)&%`yWob0`%a<=J2O#z=iTHX5 z%w6ez{BF;4f)lG(JIcpwd2nBcXSi>5H?5Nx`O`eYVN^d630}211*MnNR#ugYV-^&2o3sx-<4;>o91Rn1!h6;Yl)ARY#T5B&|)*}<$-bcJT&+f*= zc2Pe75U7o|i3plfSugZl%b&-wP*rt zHj|Azn;IIzf}WuyS)Q{edQbH$f|t;%o?Td2KsJS`P$fyG8?%#5TgmUllaX2t?;d^B zEJW0IRFYQb&V2z853+)ng^%8}Lv6rD&aHZVP107wjBzUsvMB;p!NF60eydH9O+UvWV+Y+3bRSSQQYrbAvGzZh4v5dR!K4>2US!9VL6pQI!l82X2a--Z zeN%zCGEo8@_aT)mPWG@r(&Wj-3&4#B^*HV}MUk41bVu*aEz9Q_#?-#J)2ZivPxW4& z=&f$7l95MFef?Tb@|>&d@mi;`_@<8^?QnA=|3$9e`1tNkZ+iv6XF0~+f;3M@M|Zh# zqAnhlaR8lm`DNgZ_ZxoCyP)R*g7W;LkE`0FF*oPvV>?o2hmmGucX16Ie+ZEKF zv_XN{4jP13exoX1&P{ofnyD>bV1y-M7-Y^_(-@C_5L;^w5y+|qbGhJN0cS-``C;e5Yw+>2 zr($Z#tToCk-yXlE#)~;yFI~E*Z>%ufS6LUAlAx z4j$y)Io1vquN6W(CWcqfQ>tQ0c%>V@r#6Ln#58%q0 zfR4yV8xj#QD0VhO6Dy{mr`9Cj6POi3-dG@0nmThWLZ5wmo-to^VQFbE3LOYdS*Rx3 zbIeFZSfUfB4&T+}F@X7Id8w$hH0h}6)+DZqBY{eaiuZ-gDfZ`G0Wng$WwTp;?!&6C#qWTY*cU>uz8O~)DaxcfY;4J(RU9Bdwctb6Uj^ZuyM2CW% zsp&DdkrotVT8rwx4LV81RH^jk4>%v!bG-^>_sL z1jnMp2Ho~p-R;2@pJ-Zwb$9c_>g$O`%-dQxo~IYVO0CNiBVyN{SL0lE5&WX9tt}`< z-6YPdCtj9Tq-$noXY*lHW^eA--Wa9N{qVgYgy?K|NMX&>8S;Ouks);K7`&6Z`!5C> zXvr|p9FBPpD2?09uANZ(FkoZKo(dyjin^7J&HKswvY&TGd`NoD^HrNYMhW+Ajn8lC z%>_tRKcpE^Cbu&3b+Ls{F5{EYP~IwHXf$w zh~J<0bnA<2!tx1}Gk3(UZM_V0`U&$Fox787?i(7ux0ix;f-y_5B3|zutE+=WNUp?Z zIsqO6Aw8RwVfE^yZbc2x6`Sv=VAv>NE^jT%xF39ye)7Yc6Hi^v7nZV7wQPD0$9nQL z?|X8?6kGhd`EOhc;HRTV&n*vh2uvdgZeye;5H!`P&L1LDSlOqncnErNDQw93@_l3O zZt|h@tfa%5E*Chsc{j~+oz>pjU>{aQ|F65AFj!Sd39`C!i>tSa$j7piq@G`6P@ZG>OrKac4vuqgNo{oQap7Yzk zVP}ubKZogPwp5v>{5e?hsMQ%5Bk{n7%Y(=pWrTbimA_-QIVwSfqKSDA?Z5B^y?f+i$3_k>h zg=T*Gk(>UsyBqh4o?1 z&nlNM=atBN9=&+ZO*!#-y3MAG?c^WwoX)i#7}3%6V{IWXiSLvrK?7nOjy}eA3<80P z%nJVh{_z(J*onjU)(sB<=NC8%fZf{753b3}RbMig6D z!@^WiJzF+BK>mB0)80dk2DBdLrbKoD{s+cI)|)A8lxa4(fsH9A z;nZ?=E&zFul5*fejnhRZr$1mE;4rTQa)7oWAuet${Eq47O{pu4kXq_Bqm#&A)y@M- zS5M?Y272>`WWQ}YL7mqQG?XAuVL<^I_5b`SB_#z{4LJSB<3l#s$#X@=*unx1@d}hV zv|k{4q>W?0giQv}Quc+?@F4g|UO6R{yv|TWh%scb?bLzIVE1N1@|?*jbLkIB+Yi&d z@UtX$ZEW)=g%wu5IZI%Xx>*MxOb|AV7wihE8G!#JwX$1tr1{SQ5ZdJ2jzknesvy2o$ZZJ5bhgj_CPPWSCH(AI8i z&o>2t%hbq#Ut8htVdv8?vO;PeQ5FlAgo2C-f9?8p)PyW7EXDK}!sI=iujrVWnil#k zyAzl2QcmYt2`6GUZ+r#!Eqq&Qq%npB?@efJR$);QT`&n43(RG!J0Ipj9NB6L8s%)) z)t1LhR&}AEwSs~?S65eRQQi`dAJ^Wn{53m2Z3I&7`n6(*a~YasSt8EJUy+1#C4?O&?j-eX$wj`Z zhj>O);lI<$(tcZ8yECxHJ9e#2#lzXranif(aPqv9STQ%fnY+SI15S z+yZ(ytL${L`+C!qTXK5#YAm1L6lTVh8j4ixrP0Ws+rAl$*ZkB}lZl=1Zjb&A6}nzt zi=ZA_Qgk@P8yfxZ7QMc)eKKEqHeTDea!y%!?EZYe$T`+O3=s)EX=koIMRJrwRKF&{X zP0XO{2V(CA@>T?ikW?a3Ly0q@)ULXvY;Zi|SV%6Hl_VY>K#m;6;i+eGcBo~1Tw5J# zU7Ix6f1HndL~!?}SDQ|ZU%{+aA3a17$|K14!gru;fcNIv@G$OhS}GPky5JuFOW3>K zLf&-onrSLibB%p`?db;-iG?TGy8M1oiz1IU64Y-YVcR6yXrw>gPsbp=;@_NhR(j%N z0(Y6$@;C_#Y4=}Ee4iS}^yy0Uhr&6QkZCHV?JUvr^VYY&Zy`9+F5&(Sb&`G}reAXl zK4yRI)vB-L3@Z@~s#2%+dsUZqfAz6b$s}dV(c_-0dkKWhzaDs^XSh)Gbl6viUFM4O zw2Zz>-?N0ndf2Q*-5*!Q#JKluxUxh^=|xcAB;>xDIZpjBYH%RUuTbDu_p|w5{Cuh{ z*&;g$-v`J&%f#OJzRi96dX1vFn)_tf_?OA0p&g5ZpKK+W3F)`UJ5DI6%U)PX-pCwC zl5p{BUl!%|OZO}j7{Pv^9eyc<iRiv4MZUOItsCVkte0tVuC z?wa9$v7o!SthYG(xisH@U=?Hi*LAz3ckcX?cObVqi7`A&Z}tm6KmV$??(DGnmz>bg zbwjhSk#$*tvC<7P6WAxcZa)w%9%=rNsU}$HZogS#=-Up0Bh_Dr4ZlrZP^iuJyO1SQ z$u#%pn9azHh{;Am`et(L1m6G5Jb#FVgClgJO54v{Z+7IFrS)PghC7|`*KvBLsTq6w zZ14G^k?s!_%G@lQK7QLsC_d$bM=D*TBT`W|ol)58Z zc_3F^pH=KKHVZhTTys1~ydv?Ws#PxMVwna2XR{7H0|UHvF3j@>XxY=;d`(9Ezk1&!CmzOMZ@Zry?rq4EB)TjV`7+PQ|~ zBO{P7QNh=ftz?{>P*&!Kn=K(f*)1avT9}#j|N6D(i;j^W_Ruiy*+VX)OG+TAAjFA? zl;q`o#-=!giiwGdm3-uAS4j70Ha7hYfk_1UtAete%x#};+)G#y1>5rw8sE%tGp-R9 z5h3gQ(4HZKENvZ0Glx4Kx;R7`ILhG$xD1a?hUUn`gbWmVFn>fP6%{fO0ipXW2}CSe zE6B;od8%?h)&DsJ0_?96{o5mex?V^`#3E~IY6^Q$CV%{Z*FE9xU9#Dr8{|0Ie*fs{ z&hPf$#lriZW7`zWj1w^xpKN24xM+l}n>hLSZof4JRmJLxCU9`b`}HB;9aMdIw!(bI zZsrH*8X4?j?0xt7^XK>PL!>{|*B?j)uNnX$jl@a4eL=$l7E8N$uzFfz2Vhe$&I0ZN zk)lKbw_K^NpkUcmV!x7q`u5(FBvgKEGAqMobl_aQi>H%^#eEZ9*4$gxwx?|LH52R; zZfxp0O!n|UQA_%yjg1*-N}f=m+=etm{etlbX7QRPKL17t>L9t8YgfU~(1*N-!8ZRZ zwj;qpS0G>u>tGH@PJ0xUUEd*2k&b)M41o+SIf15h6zFn{mwCy`KlL(YWIav&8nE102Q z{rxK#S*Y=Qf;oA3-oJWfTytZ`Eh;wc-t`cAULpqvx5~XdhzwV*ToHA-NgxCnJ}X+m zR>-RLH6NtL>h-m9OnxZZFt%a~CQuw4XP1N}*`&Q)@lkYC6gD;HUM%}LI2d>T{ytXL zvn0?U%4g0jVCzH>d1IQ|nKNRpL)1R4WREOH5l?#j_%VngzyjE-jtB^R>g`QBKYHmw zOpGvW=MWlx|Ne~<`%hQ`%azh>XYE;uefOWVPx25S$Ocp`IRndKhvr|fq$A3y?;XvT zyNA!Wh@L-0H(4>go5sGkDv>|q;?7efs4`hgS#Z<@TY;Eg*&~XL6;Wq6SE3Z757L|? zk!~#Q?Ca~BoteRg;r8>|JK-N(1E;Lxvy2RQwe1Io&p!R!KyPDfGPC#esil?G!uMC3 zW*a~`$diD};_A)p6bJMVL4FLBdsW>J+nU{hYBQ|T$J(Kd((6o;>^5|n1jK=!NAjYJ8Ty= z5j=Mq>gpHpu)(48J{Ln%fte58NiSb--{@+_Sp|is4^pFobmit6M0-JYo$@P_OZhJU zlfyD>D`EC@&Y2WQHoStzj~+chbkD`E6jmBNZDHP6Y$Kq78(r3MF!zWGU01yKyvxH! zk2q-l2#=7=9369q*ESFgRmb`G;auju8w)`Rb157WUiIcvTrIN2#6XkM7Oiw%?}gt7 zXv8HY3#;W)j&O0E!WN6K$7sL67Z@CrOPfja>C-1vLEy)+3TVjf|4my3JsfLjw|oZDYYeUcbKS0{OON zFb!7+Vs@^JD|Vp~c?1OqYp=!22CSjVcyc!J1vZAS)ixtIA+Qb%57&>pwpGed(fhf? z`qcLL#8XaU6D>uy>MRq}Xy?5V;p44^B3}wcS__5RijU&|Us`F~Lb4eNMQKY-&YzP{ zLI|qxU7SJ<%gCquvgEL!U=qBHB;tK|lm?z@3PuR>EOKFd;5uo=cE&wSOz)}qvNd^N ziDG7Blf@={9U1KyI?4p)Z#Vs!7iVg7g0F@bXBf&yKOJ~n9PIG=Db>u!Q*s}lZFkhi z^unGl81tHuwUFqrebERiAp9{vF~-Km*^@Lhlx#9mLPArp>^yw<5dH7r?p}pWmS$#; zmC}|F6M5#ZwVa7Qs0v}c1N9AEs0x4m_;D0|609URl3}>hH!@lW ze~=R_x++WbOIds?DDKxx-|O%`vaT?6Kzz@s64FBhzUp|rSpLYk59{-`O&2+fM85Dk z2rDV*7xnobF8#l zgpf|1f_DW*I|QxnG8f351K8pdkoc&udRX_KG z^cRBjfMW%Ws#acYW5b4r8(}gWdxAl-7lJLJFwn8RaU$(<-VuDKS17%8TI3304kl*l zKID%qJU$x!EJewzuuo1qV=RC&z~ZKywulTb=WMpBTaM}sc{YUFjM@Ha+`kx^FFwv3 z#_gVeil`;HL)XXa^5rAaw(4J7Mk}<_GGZSgIV2IoB`c$KH5Y+f2E?V^7(bo8M-lqa5IFyHTkns)D~O`)@QGr)NO#|oSg9sk_o3>-8Pq4ER|Sj#c7{153vir z)_UnrMr+tiQ-X=t$&U4R=0}>Ey&mXG=e%k1n>*3iq^q+qIWwdfnGmFF9eti}eWbn5 zez5T1Li;R2)*t>W#LnceZ!+-`b=W_+UNYzG@ZP-)<2{d za8b;$AI;)ZNIi6ZwA8_Y({5ohDY?r7jR70yLwvIL}Y2y-erU z=t?bow~Y7y+RqY7An2Rfu^$(qmeAA64{=MoB&$%!HN{MxLXrHDz4eEDG&r*=q?I2( zdlIA4;Z`kA8@G|}1Tpo!h zOSg(R^5;`%2L-L9f#TBs-L&6jH>a8NYpUvmNau_9CVg6%|9(*|Uw`dGMijnT9Vj*B zHnF75P%2P3-k3X|4#LhxbgQRV$J?p*I|C&iYtqn&>kj!y#+SGq|Kogw)ot@4?Fm&m zYrRrTb4;kUM7jKD11}^tdPqLnef9|!*oEVJD(5+-p1z=<^h&;JSKmw*Lcf`0W|}!T zZr9ZI<#EoV{IvXcw02qy*j_lJ6B7PrPst;~g4&0}v4y>{V+v2guRQ45 zo8MI6X8L86N+mG0;BAGIE|BKn_o%+z6k>xP!LZ+zUK zuzYngC^+~45u|Qsj27QuP(t>uibT~e2__%$y`eL<&Ug9fVsa;Em6ac>CtnrWeNeJi z)X_xiEx*5TU02tB`NtJPA{ILcR$p%jlr&^h?%!MaN>C414FBtjCt6_<;Hl}0+(@CeA$>O6=?# zB11U5=XBEL+nyZaKe_2l$_P)m)!^G~{z0J*Sy?r`jIYtpH-MO1nA8{!`8A;&tcX7q zb0vuWKC{BQfTUsuHc>q|Nui~)Bj~hS(I2Oy%SR=qlYCBPH#~da;E)!l8v5MP_KBr^ zs-=DA*UzNJcbeqy8eN_Lr?oSGhjM@1_@j=TLLwod)5wy&(uP!;RHE#ZU4@Wrja{k8 zQdE{fmL!ES>5#QhNfM%i!3;`?veuEMB;Wh#^Zf%pKYX66t1d2cndQAa@B4n;cNY7< zuom+W{tRE?97dmyMo6K{NQK;~fK5+}ogTfSrL|}T+-qg&pfuEN*=v{Nj`qIp}83pE>JF85G==f%y$j&N>_d+`#Zre5+p=*)d z&dPsSqG!W2w#sgQWyW49YF47htgIMQxK%9qw%O>Diin;>xX}JAs*)Q z>>m*#9?9v~h8)zq>YVteFEw>bO{Nllm)yG#+T2hG;9Dv9Nz3(GTUc>)`_Ey;=$qjQ z*IGQMR%%`u3n(8uJS^_(ol`nk^H2274Lj{PmW*~+zKq%-M^#Th_nYN6#L^PjQHC~0 zAFIsrsG>9k>el33m`eYU16|8&w^xa*^1|?&O{-S>+`P}c)>%_#u+X6Z`MXK z7QITvuL`$F)#O&*{l`1rR!6&5#7tqK)4w@-Om3j(N?AI6X27Y) z?TV-$)J>f5x1GFdQ#9fp_HkTZyvSj zs8|uP>~zeRULH2f11kb~~xaQyb060Ie(T7x+&=yVsIml5_=mD3DslRQ=^o@!No)MNa|t;0QK9i^O=-64QM z1eaaSsD-+Nqxlcb-mUyZD_5ppJxj65)~@hWURBAVk^?TC3jcbrK95oFs%9a1R{|8t zIWvTn%LGX`GCZssmM+7T-4wo6-GhpakzwYM836MFIwqynpuQ-9Ol9e@Wxiu{ga5whZTc6M(u z6QL?aQODL)pwxjBFCmqoux#V@?PQ>d46aRb#CJe1qf*|W7a{6E_M2d^*x;uT>VVi) z56u&P6Rg#G)KG-}^rr>Gr!q6^0CE*656MJcxEkk2c(kKzVAX&a5%0IoGSr&s@c}^x z0MyCCrY1B5x2ecKKvLPDtlZq#h)|C;zUz0+k@(`dX)BpcM*@p%0l*``q|YiAK7Kzj z(Zby6J@67?ZCe21fDTt00qespPha4OvUX->Vqzi$$@X?(2??z;eOeH_C}6@HnwqqH z2KfXLJ@c)LUIk|q7HEVjIR0uJT<2zIui(gn42SiR@PLzts%#58N3wrkQ}*kc7G|cN z2+{_bB@Z92AlqCV9VtQn9CqL6Co);c$j|5F5fv8p4+!|%ZEVydgR>J7J>dPp7pOmg z5K^?DN^gvE=_&UDl|!LKIFu_DpJ))GHQ`2`Js$#v_NooEE1u;N2dKf?nZ4KQKb!_W zXoK#)9TZ?oB=^VJ(}D9f&)f?Ae;ambec5nSVsasIr{$&eV7r-2%At52L zh;@|v>EEK{GRi~eH8h_LbpPY2=<}F=*{#iF4Cib8T2)kG6crgW&C$z+^PUurcsCU( zw?SS$#+g)9)mHz&f!zFjV@8K_OUBj6NGPd>n4)fOmsQ1o9tjN%g%+->8-ZSg#*dJY zgSF2A+(*42H6bNsLwo}c;Jc~Dd8V@QC^m|SbaivH3;ZloVf_n1hYg5J>cLl@`;;9= z=0f2m4A5*%OfdFlky}%TPou2Nb*xjomIL{?M)jH;@tf}3#5Q~~K1P?`Q(eIN?S z{+&moS|C-`)E*$Jkd@UBnhp1z9UUD|(y8hwu1e8QN=wtHA_|DqH|*k3b4Bw4OT1-p zr;(5Aa6OB$j&v(1B>1uis`gyWt2oj4y4}%UVQ^t?Q@@h1AZUYj&j1sXHe?4PU0`>Q z-q_aXe=!p0;p5x&@3rwuX(dO(3-6YZbk2%ILsOe4gDgN{BM@D-o@@@m(=Ho;WFdPS zB{H@A5LW=VWCjebo!wA-&kRhz4C zTD`?pSP+@zDV242yRzZ;jAi6)hjeu>BQPI2)We4fF~O*(@E2Z0e7h3l)QF6R4Wk3( zMY>y%ebqGE4MsU8ELnHi_8Mc}qwAQsl$3|Fv)_y<)D%v8yE?K3v@)II)5gflZ@khY zQ6$4|c*;hY4j$IM-e+WY_+pgf!DSd1|cRamIHW``#K5~6kSc#3lOhDvi~6pdhHT97>& zIrdBa`G>FLHx!~Gm0yCgC_dFDTl-NXJ(f2rhI~d?g13U&lN61vbEG&jrQ?zT6RE$lB0O&Rv}6CVqAiF7nb5&3M+rCDCfX>acJZW zH;%Mt(|W7hmlnCz_8E72-2YwLGB7sQ{EOZ)WLNH)m6KEFnUNBSm_Cq)G(!t`gWzC< zqNuX*y{GtsXmw61#Q6-b7WW3(z4yDH82X(!RC=A{Hq*Dbv3mEX9xSD*3R|wZs#^@l zhsNtS+O>x|>XS^R813G@8!#Ti>5m-TMcX0DSE@;c?Oq`vVU2nNwCK?o;0VP z;N)1kd*aY72|a676t$<#K>NohX$l+w!Jz6o1Vp~T$5RHhsC4w76bodnsqI}|E@DUA z+(yu(fp~t|7myZ5(Yfm2uugOBa-wx|JVP0#5o-7Rkx@W~+(ZBP@egnUO%*!uk!h3~ z_twPbd1GZp6bA#bs{i|G^j>0_KraW7W~ted%B3m;VI^MP-ZvUQV!w)sjh&vHoP$3E zdT@=nIDCZeK50rSEDh|hqyvDlf^b0xhckzb3udhkU`OOe>s1b9V~2nZjH$U6cOk-f>vLmxUby3lg)5 zu`ztlHw|&3vm0;SGs2YS9nAOM)5Axgd(6YM=3z7 zDxQATP>&fFEBD-Hl%2FW00lP=@z;!o*aN_MQI&|yOq7j@o zQT1sc$xWQE*jqX(RDO+ooV|L&Z!%AJ?^2S?`=5MS+sSva8_{wMth=$#j1h7{!;Hy( zE~0mNUQxV8rm~SvSU?KQjl8`N+~GFN@^KYN{c6%Ioa`2o5l*Hftku{q4<_xq=a)3=> z%AGuMB3VO%AT}pvWY_}yGdC{{o&S-PBw})TvHiw^(o5J?9~tMNAVNbB8KqS6XMOH; zj*!jGA~E0&{IMayxx1-BAz~a#WK3OM6>8OhQ3(hL;O1)pSuA}?LE?P(4tTzxsgMxr z3mB4owp8x?#)9HY3b^Fu{RdN=Q3?3r{rf)yxQKVOt{yRTAqom&l9OCre!hYU54Zhl z{5)J}>D%Zgp+sN3y6VqAaATXTo4xU@H9pA!I0Crg0InF)A1*o@{0nxmuSPG5n)D?_ z&!2qoOh}K>5en@ecY2s?vXm(5CZ{H`aGkG>sx`?P>UadBr*Y^@03_2{U_E$Z3jHg|!JHx9kG z^hi(`@TgTiDq><{^m6d3L1u2X@g<1C3(R=DwxEfsdS&3^>u=+)%1RCFi}Bn%_Dc(x zm)PJoI!eN)xg$mnHbs3ErmI2@gTPlexb5y>&Q=LU(6bp@2;Lo2f3067^94Q#LF znhb@k>4~>?Fl2>q`saWaC;16y);`T5uH!PBufViD!O%)f@kW~1n&ul8>|V}WURAFP(x6G|6%t$a-yn@sZ=mlK3Y zU7())^lGo`*RNwm@e{Ar{>v3+xxc3bp_SHkSzzTG9MQ(rQEqLFO1i{Xc;!>}E`-R7 zz`!iBh75t-M{x%akk_Xa;GRv_4CM>*@;?6*BOYWNB^R9YQWu3t2>ywS{C{R?#DDeW z={Ob&(6B(r@^O!6{uZw`pB0`tFa4^>^7)>V%RTL_L}Io-@G?BQqEB!j{x#}+4H+boXd_}7hwW9BZ!0h4pZ;z*kAZRrGm&~ literal 0 HcmV?d00001 diff --git a/book/en-us/00-preface.md b/book/en-us/00-preface.md index 3d3f7f6..442c2b5 100644 --- a/book/en-us/00-preface.md +++ b/book/en-us/00-preface.md @@ -11,7 +11,7 @@ order: 0 ## Introduction C++ user group is a fairly large. From the advent of C++98 to the official finalization of C++11, it has accumulated over a decade. C++14/17 is an important complement and optimization for C++11, and C++20 brings this language to the door of modernization. The extended features of all these new standards are given to the C++ language. Infused with new vitality. -C++ programmers, who are still using **traditional C++** (this book refers to C++98 and its previous C++ standards as traditional C++), may even amzed by the fact that they are not using the same language while reading modern C++ code. +C++ programmers, who are still using **traditional C++** (this book refers to C++98 and its previous C++ standards as traditional C++), may even amazed by the fact that they are not using the same language while reading modern C++ code. **Modern C++** (this book refers to C++11/14/17/20) introduces a lot of features into traditional C++, which makes the whole C++ become language that modernized. Modern C++ not only enhances the usability of the C++ language itself, but the modification of the `auto` keyword semantics gives us more confidence in manipulating extremely complex template types. At the same time, a lot of enhancements have been made to the language runtime. The emergence of Lambda expressions has made C++ have the "closure" feature of "anonymous functions", which is almost in modern programming languages ​​(such as Python/Swift/.. It has become commonplace, and the emergence of rvalue references has solved the problem of temporary object efficiency that C++ has long been criticized. diff --git a/book/en-us/01-intro.md b/book/en-us/01-intro.md index 96619c5..73d6f7e 100644 --- a/book/en-us/01-intro.md +++ b/book/en-us/01-intro.md @@ -23,9 +23,10 @@ InstalledDir: /Library/Developer/CommandLineTools/usr/bin Before learning modern C++, let's take a look at the main features that have been deprecated since C++11: -> **Note**: Deprecation is not completely unusable, it is only intended to imply that programmers will disappear from future standards and should be avoided. However, the deprecated features are still part of the standard library, and most of the features are actually "permanently" reserved for compatibility reasons. +> **Note**: Deprecation is not completely unusable, it is only intended to imply that features will disappear from future standards and should be avoided. However, the deprecated features are still part of the standard library, and most of the features are actually "permanently" reserved for compatibility reasons. - **The string literal constant is no longer allowed to be assigned to a `char *`. If you need to assign and initialize a `char *` with a string literal constant, you should use `const char *` or `auto`.** + ```cpp char *str = "hello world!"; // A deprecation warning will appear ``` @@ -115,6 +116,7 @@ LDFLAGS_COMMON = -std=c++2a all: $(C) -c $(SOURCE_C) $(CXX) $(SOURCE_CXX) $(OBJECTS_C) $(LDFLAGS_COMMON) -o $(TARGET) + clean: rm -rf *.o $(TARGET) ``` diff --git a/book/en-us/02-usability.md b/book/en-us/02-usability.md index 95df99c..9b11e09 100644 --- a/book/en-us/02-usability.md +++ b/book/en-us/02-usability.md @@ -143,7 +143,7 @@ In the above example, `char arr_4[len_2]` may be confusing because `len_2` has b Why is `char arr_4[len_2]` still illegal? This is because the length of the array in the C++ standard must be a constant expression, and for `len_2`, this is a `const` constant, not a constant expression, -so even if this behavior is in most compilers Both support, but) it is an illegal behavior, +so even if this behavior is supported by most compilers, but it is an illegal behavior, we need to use the `constexpr` feature introduced in C++11, which will be introduced next, to solve this problem; for `arr_5`, before C++98 The compiler cannot know that `len_foo()` actually returns a constant at runtime, which causes illegal production. @@ -155,7 +155,7 @@ actually returns a constant at runtime, which causes illegal production. C++11 provides `constexpr` to let the user explicitly declare that the function or object constructor will become a constant expression at compile time. This keyword explicitly tells the compiler that it should verify that `len_foo` -should be a compile time. Constant expression. +should be a compile time constant expression. Constant expression. In addition, the function of `constexpr` can use recursion: @@ -222,8 +222,8 @@ int main() { ``` In the above code, we can see that the `itr` variable is defined in the scope of -the entire `main()`, which causes us to rename the other when we need to traverse -the entire `std::vectors` again. A variable. C++17 eliminates this limitation so that +the entire `main()`, which causes us to rename the other when a variable need to traverse +the entire `std::vectors` again. C++17 eliminates this limitation so that we can do this in if(or switch): ```cpp @@ -280,7 +280,7 @@ To solve this problem, C++11 first binds the concept of the initialization list to the type and calls it `std::initializer_list`, allowing the constructor or other function to use the initialization list -like a parameter, which is The initialization of class objects provides +like a parameter, which is the initialization of class objects provides a unified bridge between normal arrays and POD initialization methods, such as: @@ -961,7 +961,7 @@ public: }; class Subclass : public Base { public: - using Base::Base; // inhereit constructor + using Base::Base; // inheritance constructor }; int main() { Subclass s(3); diff --git a/book/en-us/03-runtime.md b/book/en-us/03-runtime.md index 26fac34..5ceee68 100644 --- a/book/en-us/03-runtime.md +++ b/book/en-us/03-runtime.md @@ -11,7 +11,7 @@ order: 3 ## 3.1 Lambda Expression Lambda expressions are one of the most important features in modern C++, and Lambda expressions actually provide a feature like anonymous functions. -Anonymous functions are used when a function is needed, but you don't want to use a function to name a function. There are actually many, many scenes like this. +Anonymous functions are used when a function is needed, but you don’t want to use name to call a function. There are actually many, many scenes like this. So anonymous functions are almost standard on modern programming languages. ### Basics @@ -24,7 +24,7 @@ The basic syntax of a Lambda expression is as follows: } ``` -The above grammar rules are well understood except for the things in `[catch list]`, +The above grammar rules are well understood except for the things in `[capture list]`, except that the function name of the general function is omitted. The return value is in the form of a `->` (we have already mentioned this in the tail return type earlier in the previous section). @@ -143,7 +143,7 @@ void lambda_generic() { ## 3.2 Function Object Wrapper -Although this part of the standard library is part of the standard library, +Although the features are part of the standard library and not found in runtime, it enhances the runtime capabilities of the C++ language. This part of the content is also very important, so put it here for introduction. @@ -262,7 +262,7 @@ are all pure rvalue values. **xvalue, expiring value** is the concept proposed by C++11 to introduce rvalue references (so in traditional C++, pure rvalue and rvalue are the same concept), -that is, A value that is destroyed but can be moved. +a value that is destroyed but can be moved. It would be a little hard to understand the xvalue, let's look at the code like this: @@ -330,7 +330,7 @@ int main() std::string&& rv2 = lv1 + lv2; // legal, rvalue ref extend lifecycle rv2 += "string"; // legal, non-const reference can be modified - std::cout << rv2 << std::endl; // string,string,string, + std::cout << rv2 << std::endl; // string,string,string,string reference(rv2); // output: lvalue @@ -496,7 +496,7 @@ For `pass(1)`, although the value is the rvalue, since `v` is a reference, it is Therefore `reference(v)` will call `reference(int&)` and output lvalue. For `pass(l)`, `l` is an lvalue, why is it successfully passed to `pass(T&&)`? -This is based on the **reference contraction rule**: In traditional C++, we are not able to continue to reference a reference type. +This is based on the **reference collapsing rule**: In traditional C++, we are not able to continue to reference a reference type. However, C++ has relaxed this practice with the advent of rvalue references, resulting in a reference collapse rule that allows us to reference references, diff --git a/book/en-us/04-containers.md b/book/en-us/04-containers.md index 8a39cb7..bdfe638 100644 --- a/book/en-us/04-containers.md +++ b/book/en-us/04-containers.md @@ -172,7 +172,7 @@ Key:[3] Value:[3] ## 4.3 Tuples Programmers who have known Python should be aware of the concept of tuples. Looking at the containers in traditional C++, except for `std::pair` -There seems to be no ready-made structure to store different types of data (usually we will define the structure ourselves). +there seems to be no ready-made structure to store different types of data (usually we will define the structure ourselves). But the flaw of `std::pair` is obvious, only two elements can be saved. ### Basic Operations diff --git a/book/en-us/05-pointers.md b/book/en-us/05-pointers.md index 357098a..d2e6eb0 100644 --- a/book/en-us/05-pointers.md +++ b/book/en-us/05-pointers.md @@ -26,7 +26,7 @@ These smart pointers include `std::shared_ptr`/`std::unique_ptr`/`std::weak_ptr` ## 5.2 `std::shared_ptr` -`std::shared_ptr` is a smart pointer that records how many `shared_ptr` points to an object, eliminating the display call `delete`, which automatically deletes the object when the reference count becomes zero. +`std::shared_ptr` is a smart pointer that records how many `shared_ptr` points to an object, eliminating to call `delete`, which automatically deletes the object when the reference count becomes zero. But not enough, because using `std::shared_ptr` still needs to be called with `new`, which makes the code a certain degree of asymmetry. @@ -133,12 +133,12 @@ int main() { // p2 is empty, no prints if(p2) p2->foo(); - std::cout << "p2 was destroied" << std::endl; + std::cout << "p2 was destroyed" << std::endl; } // p1 is not empty, prints if (p1) p1->foo(); - // Foo instance will be destroied when leaving the scope + // Foo instance will be destroyed when leaving the scope } ``` @@ -157,14 +157,14 @@ class A { public: std::shared_ptr pointer; ~A() { - std::cout << "A was destroied" << std::endl; + std::cout << "A was destroyed" << std::endl; } }; class B { public: std::shared_ptr pointer; ~B() { - std::cout << "B was destroied" << std::endl; + std::cout << "B was destroyed" << std::endl; } }; int main() { @@ -177,9 +177,9 @@ int main() { } ``` -The result is that A and B will not be destroyed. This is because the pointer inside a, b also references `a, b`, which makes the reference count of `a, b` become 2, leaving the scope. When the `a, b` smart pointer is destructed, it can only cause the reference count of this area to be decremented by one. This causes the memory area reference count pointed to by the `a, b` object to be non-zero, but the external has no The way to find this area, it also caused a memory leak, as shown in Figure 5.1: +The result is that A and B will not be destroyed. This is because the pointer inside a, b also references `a, b`, which makes the reference count of `a, b` become 2, leaving the scope. When the `a, b` smart pointer is destructed, it can only cause the reference count of this area to be decremented by one. This causes the memory area reference count pointed to by the `a, b` object to be non-zero, but the external has no way to find this area, it also caused a memory leak, as shown in Figure 5.1: -![Figure 5.1](../../assets/figures/pointers1.png) +![Figure 5.1](../../assets/figures/pointers1_en.png) The solution to this problem is to use the weak reference pointer `std::weak_ptr`, which is a weak reference (compared to `std::shared_ptr` is a strong reference). A weak reference does not cause an increase in the reference count. When a weak reference is used, the final release process is shown in Figure 5.2: diff --git a/book/en-us/07-thread.md b/book/en-us/07-thread.md index 87ef887..077d0d2 100644 --- a/book/en-us/07-thread.md +++ b/book/en-us/07-thread.md @@ -35,9 +35,9 @@ C++11 introduces a class related to `mutex`, with all related functions in the ` It can be locked by its member function `lock()`, and `unlock()` can be unlocked. But in the process of actually writing the code, it is best not to directly call the member function, Because calling member functions, you need to call `unlock()` at the exit of each critical section, and of course, exceptions. -At this time, C++11 also provides a template class `std::lock_gurad` for the RAII syntax for the mutex. +At this time, C++11 also provides a template class `std::lock_guard` for the RAII syntax for the mutex. -RAII guarantees the exceptional security of the code while losing the simplicity of the code. +RAII guarantees the exceptional security of the code while keeping the simplicity of the code. ```cpp #include @@ -156,7 +156,7 @@ The condition variable `std::condition_variable` was born to solve the deadlock For example, a thread may need to wait for a condition to be true to continue execution. A dead wait loop can cause all other threads to fail to enter the critical section so that when the condition is true, a deadlock occurs. Therefore, the `condition_variable` instance is created primarily to wake up the waiting thread and avoid deadlocks. -`notd_one()` of `std::condition_variable` is used to wake up a thread; +`notify_one()` of `std::condition_variable` is used to wake up a thread; `notify_all()` is to notify all threads. Below is an example of a producer and consumer model: ```cpp @@ -253,7 +253,7 @@ int main() { } ``` -Intuitively, ʻa = 5;` in `t2` seems to always execute before `flag = 1;`, and `while (flag != 1)` in `t1` seems to guarantee `std ::cout << "b = " << b << std::endl;` will not be executed before the mark is changed. Logically, it seems that the value of `b` should be equal to 5. +Intuitively, `a = 5;` seems in `t2` seems to always execute before `flag = 1;`, and `while (flag != 1)` in `t1` seems to guarantee `std ::cout << "b = " << b << std::endl;` will not be executed before the mark is changed. Logically, it seems that the value of `b` should be equal to 5. But the actual situation is much more complicated than this, or the code itself is undefined behavior, because for `a` and `flag`, they are read and written in two parallel threads. There has been competition. In addition, even if we ignore competing reading and writing, it is still possible to receive out-of-order execution of the CPU, and the impact of the compiler on the rearrangement of instructions. Cause `a = 5` to occur after `flag = 1`. Thus `b` may output 0. diff --git a/book/zh-cn/07-thread.md b/book/zh-cn/07-thread.md index d55ab0b..1dfd931 100644 --- a/book/zh-cn/07-thread.md +++ b/book/zh-cn/07-thread.md @@ -35,7 +35,7 @@ C++11 引入了 `mutex` 相关的类，其所有相关的函数都放在 `foo(); - std::cout << "p2 was destroied" << std::endl; + std::cout << "p2 was destroyed" << std::endl; } // p1 is not empty, prints if (p1) p1->foo(); - // Foo instance will be destroied when leaving the scope + // Foo instance will be destroyed when leaving the scope } diff --git a/code/5/5.3.weak.ptr.cpp b/code/5/5.3.weak.ptr.cpp index 7bdda78..cd84647 100644 --- a/code/5/5.3.weak.ptr.cpp +++ b/code/5/5.3.weak.ptr.cpp @@ -18,14 +18,14 @@ class A { public: std::shared_ptr pointer; ~A() { - std::cout << "A was destroied" << std::endl; + std::cout << "A was destroyed" << std::endl; } }; class B { public: std::shared_ptr pointer; ~B() { - std::cout << "B was destroied" << std::endl; + std::cout << "B was destroyed" << std::endl; } }; int main() { diff --git a/exercises/7/7.1/thread_pool.hpp b/exercises/7/7.1/thread_pool.hpp index d885140..c1e22cb 100644 --- a/exercises/7/7.1/thread_pool.hpp +++ b/exercises/7/7.1/thread_pool.hpp @@ -109,7 +109,7 @@ decltype(auto) ThreadPool::enqueue(F&& f, Args&&... args) { { std::unique_lock lock(queue_mutex); - // avoid add new thread if theadpool is destroied + // avoid add new thread if theadpool is destroyed if(stop) throw std::runtime_error("enqueue on stopped ThreadPool");