Commit Graph

184 Commits

Author SHA1 Message Date
johnwdjiang
fb7fa6dc99 Merge remote-tracking branch 'upstream/master' into master 2020-10-21 16:12:12 +08:00
johnwdjiang
a4e53c06ba finish item39 2020-10-21 16:11:21 +08:00
johnwdjiang
296ea089fa hung item39 2020-10-20 21:06:44 +08:00
David
fb1f4defb7
finish item36 37 (#52)
Co-authored-by: johnwdjiang <johnwdjiang@tencent.com>
2020-10-20 15:37:31 +08:00
johnwdjiang
f3e583375e finish item36 37 2020-10-20 15:23:18 +08:00
kelthuzadx
17b7aef5f0
Merge pull request #50 from wendajiang/master
关于第5章和Item42
2020-10-19 23:21:44 +08:00
johnwdjiang
f40b1f0508 finish item36 2020-10-19 21:41:54 +08:00
johnwdjiang
f99bd29c41 补充concurrency前言 2020-10-19 20:51:38 +08:00
johnwdjiang
11202d340f Merge remote-tracking branch 'upstream/master' into master 2020-10-19 16:12:51 +08:00
johnwdjiang
9c276644e9 add item42 to readme 2020-10-19 16:12:48 +08:00
johnwdjiang
7a5692b3c9 finish item42 2020-10-19 16:11:19 +08:00
kelthuzadx
b773f5a87b
Merge pull request #49 from XiaotaoGuo/item23_fix_typo
fix typo in item23
2020-10-19 11:10:10 +08:00
kelthuzadx
fa01919713
Merge pull request #48 from XiaotaoGuo/item9_fix_typo_format
fix typo & format in item09
2020-10-19 11:09:51 +08:00
XiaotaoGuo
aedd459f1f fix typo 2020-10-18 23:04:56 -04:00
XiaotaoGuo
b43b6aaae2 fix typo & format 2020-10-18 22:05:05 -04:00
johnwdjiang
1f79f0d3c8 sync 2020-10-16 21:06:34 +08:00
kelthuzadx
e974a15c58
Merge pull request #46 from LucienXian/master
add item34
2020-10-16 16:16:53 +08:00
kelthuzadx
f646b55152
Merge branch 'master' into master 2020-10-16 16:16:45 +08:00
kelthuzadx
4de05606f5
Merge pull request #47 from sdutwsl/patch
Update README.md
2020-10-16 16:14:59 +08:00
johnwdjiang
e64023f276 fix 2020-10-16 14:57:04 +08:00
johnwdjiang
111d38199d fix 2020-10-16 14:56:15 +08:00
johnwdjiang
8a5352cc71 差一句长句完成的item30 2020-10-16 13:33:37 +08:00
玥玥放学啦
fa5f5adfc6
Update README.md
修改打字错误
line 55 	4. Item 34:有限考虑lambda表达式而非std::bind
修改 '有限' 为 '优先'
2020-10-15 23:39:57 +08:00
johnwdjiang
86c25974a4 fix item28 2020-10-15 20:51:43 +08:00
johnwdjiang
be0205aa13 fix item28 2020-10-15 16:47:49 +08:00
johnwdjiang
b11895622a fix item29; add item26-30 2020-10-15 10:40:49 +08:00
johnwdjiang
f74ebd2909 finish item25 2020-10-14 16:35:23 +08:00
johnwdjiang
61e71a4f30 add list 2020-10-13 21:13:53 +08:00
johnwdjiang
8eca975896 resolve conflict 2020-10-13 15:32:16 +08:00
johnwdjiang
e3e7fd6240 add 21 2020-10-13 15:30:39 +08:00
johnwdjiang
c0872f85a4 fix 2020-10-12 17:00:08 +08:00
kelthuzadx
b7c0fb9181
Merge pull request #44 from pusidun/item21
add Item21
2020-10-09 10:51:59 +08:00
pusidun
2c0c2f76a8 add item 21 2020-10-08 20:10:42 +08:00
LucienXian
eaff170ba6 Merge branch 'master' of https://github.com/kelthuzadx/EffectiveModernCppChinese 2020-10-08 02:19:41 +08:00
LucienXian
63015a76e3 add iten 34
README.md
2020-10-08 01:03:54 +08:00
kelthuzadx
ad76049633
Merge pull request #43 from LucienXian/master
add item33
2020-10-07 16:02:55 +08:00
LucienXian
6f83b73dcd add item33 2020-09-24 01:06:08 +08:00
kelthuzadx
0946c7b0e2
Merge pull request #39 from wendajiang/master
修复Item29和Item41的文件名连接错误
2020-09-08 09:58:41 +08:00
johnwdjiang
c1168654b1 文件名改为小写 2020-09-07 22:09:53 +08:00
johnwdjiang
22b384269f 文件名改为小写 2020-09-07 22:06:13 +08:00
johnwdjiang
6fcf089f12 补充完整Item18 2020-09-07 22:01:21 +08:00
johnwdjiang
f4f16be888 Merge remote-tracking branch 'upstream/master' 2020-09-07 19:10:51 +08:00
kelthuzadx
44971daf87
Merge pull request #42 from cellspace/patch-1
修改示例中的错误
2020-09-02 09:56:57 +08:00
cellspace
43ba93f45a
修改示例中的错误
原书中的变量名是“i”而不是"x"
2020-08-25 17:14:56 +08:00
johnwdjiang
2e698ace76 fix link file name 2020-08-06 18:03:43 +08:00
kelthuzadx
029c342e0d
Merge pull request #37 from zyuchuan/master
fixed typos
2020-07-31 13:48:27 +08:00
Jack
90985160ca modification to item 15 2020-07-31 11:36:15 +08:00
Jack
bd42c2c265 fixed typos 2020-07-30 10:58:39 +08:00
kelthuzadx
7a396102e3
Merge pull request #36 from deximy/deximy
Update item5.md && item6.md
2020-07-19 11:06:22 +08:00
deximy
834d6c79a0
Merge pull request #2 from deximy/master
Sync
2020-07-19 01:07:17 +08:00