Skip to content

Commit

Permalink
update: prepare C++20
Browse files Browse the repository at this point in the history
  • Loading branch information
changkun committed Jul 8, 2019
1 parent 7204a23 commit 407148c
Show file tree
Hide file tree
Showing 28 changed files with 66 additions and 67 deletions.
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

## ๆไบค Issue

ใ€ŽC++ 11/14/17ใ€็š„ issue ็”จไบŽ่ฟฝ่ธชไนฆไธญๅญ˜ๅœจ็š„ๅŽŸๅˆ™ๆ€ง็š„ๆ่ฟฐ้”™่ฏฏใ€ๅญ˜ๅœจ็š„ `typo` ้”™่ฏฏ๏ผŒไปฅๅŠๅ‘ๆœฌไนฆไฝœ่€…ๆ้—ฎ็ญ‰ใ€‚
ใ€ŽC++ 11/14/17/20ใ€็š„ issue ็”จไบŽ่ฟฝ่ธชไนฆไธญๅญ˜ๅœจ็š„ๅŽŸๅˆ™ๆ€ง็š„ๆ่ฟฐ้”™่ฏฏใ€ๅญ˜ๅœจ็š„ `typo` ้”™่ฏฏ๏ผŒไปฅๅŠๅ‘ๆœฌไนฆไฝœ่€…ๆ้—ฎ็ญ‰ใ€‚

- ้€šๅธธๆƒ…ๅ†ตไธ‹๏ผŒไฝ ๅฏ่ƒฝไผšๅ‘็ŽฐไนฆไธญๆŸไธชๆฎต่ฝๅญ˜ๅœจ้”™ๅˆซๅญ—ใ€่ฏญไน‰้”™่ฏฏใ€ๆ–‡ๆณ•้”™่ฏฏ็ญ‰ใ€‚
่ฟ™้ƒฝๆ˜ฏ `typo` ้”™่ฏฏใ€‚ๅฆ‚ๆžœ่ฏฅ้”™่ฏฏๅทฒ็ปๅฏนไฝ ็š„้˜…่ฏป้€ ๆˆไบ†ไธ€ๅฎš้šœ็ข๏ผŒ
Expand All @@ -24,7 +24,7 @@

## ๆไบค Pull request

ใ€ŽC++ 11/14/17ใ€ๆ˜ฏไธ€ๆœฌๅผ€ๆบไนฆ็ฑ๏ผŒไปปไฝ•ไบบ้ƒฝๅฏไปฅๅ‚ไธŽ่ดก็Œฎ่‡ชๅทฑ PRใ€‚ไฝ†ๅœจๆไบค PR ไน‹ๅ‰่ฏทไป”็ป†้˜…่ฏปไธ‹้ข็š„่ฏดๆ˜Ž๏ผš
ใ€ŽC++ 11/14/17/20ใ€ๆ˜ฏไธ€ๆœฌๅผ€ๆบไนฆ็ฑ๏ผŒไปปไฝ•ไบบ้ƒฝๅฏไปฅๅ‚ไธŽ่ดก็Œฎ่‡ชๅทฑ PRใ€‚ไฝ†ๅœจๆไบค PR ไน‹ๅ‰่ฏทไป”็ป†้˜…่ฏปไธ‹้ข็š„่ฏดๆ˜Ž๏ผš

- ๅฝ“ไฝ ่ฎคไธบ้œ€่ฆๆไบคไธ€ไธช PR ๆ—ถ๏ผŒ่ฏท็กฎไฟ [issue ๅˆ—่กจ](https://github.com/changkun/modern-cpp-tutorial/issues)ไธญ๏ผŒๅทฒ็ปๅŒ…ๅซไบ†ไฝ ๆƒณ่ฆ่งฃๅ†ณ็š„้—ฎ้ข˜ใ€‚
ๅฆ‚ๆžœๆฒกๆœ‰๏ผŒ่ฏทๅ‚่€ƒ**ๆไบค Issue** ไธ€่Š‚ไธญ็š„ๆ่ฟฐ๏ผŒๆไบคไฝ ็š„ issue๏ผŒๅ†ๆไบคไฝ ็š„ PRใ€‚
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2016 - Present Changkun Ou <hi@changkun.us>
Copyright (c) 2016 - 2019 Changkun Ou <hi@changkun.us>

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
9 changes: 3 additions & 6 deletions README-en-us.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
<img src="assets/cover-2nd-en.png" alt="logo" height="600" align="right" />

# C++11/14/17 On the Fly
# C++11/14/17/20 On the Fly

![](https://img.shields.io/badge/version-v2-green.svg) [![](https://img.shields.io/badge/language-%E7%AE%80%E4%BD%93%E4%B8%AD%E6%96%87-red.svg)](./README.md) [![](https://img.shields.io/badge/language-English-blue.svg)](./README-en-us.md) [![](https://img.shields.io/badge/$-donate-ff69b4.svg)](./assets/donate.md) [![](https://img.shields.io/badge/chat-community-667ed5.svg)](./assets/community.md)


> This book is adapting to C++17 and translating to English.
## Purpose

The book claims "On the Fly". Its intent is to provide a comprehensive introduction to the relevant features regarding modern C++ (before 2020s).
Expand All @@ -15,7 +12,7 @@ Readers should aware that all of these features are not required. It should be l

At the same time, instead of grammar-only, the book introduces the historical background as simple as possible of its technical requirements, which provides great help in understanding why these features comes out.

In addition, The author would like to encourage that readers should be able to use C++17 directly in their new projects and migrate their old projects to C++17 gradually after read the book.
In addition, The author would like to encourage that readers should be able to use modern C++ directly in their new projects and migrate their old projects to modern C++ gradually after read the book.

## Targets

Expand Down Expand Up @@ -51,4 +48,4 @@ The author has limited time and language skills. If readers find any mistakes of

## Licenses

<a rel="license" href="http://creativecommons.org/licenses/by-nc-nd/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by-nc-nd/4.0/88x31.png" /></a><br />This work is written by [Ou Changkun](https://changkun.de) and licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-nc-nd/4.0/">Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License</a>. The code of this repository is open sourced under the [MIT license](./LICENSE).
<a rel="license" href="http://creativecommons.org/licenses/by-nc-nd/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by-nc-nd/4.0/88x31.png" /></a><br />This work was written by [Ou Changkun](https://changkun.de) and licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-nc-nd/4.0/">Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License</a>. The code of this repository is open sourced under the [MIT license](./LICENSE).
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<img src="assets/cover-2nd.png" alt="logo" height="600" align="right" />
<img src="assets/cover-2nd.png" alt="logo" height="550" align="right" />

# ใ€Š้ซ˜้€ŸไธŠๆ‰‹ C++11/14/17ใ€‹
# ใ€Š้ซ˜้€ŸไธŠๆ‰‹ C++11/14/17/20ใ€‹

[![](https://img.shields.io/badge/language-%E7%AE%80%E4%BD%93%E4%B8%AD%E6%96%87-red.svg)](./README.md) [![](https://img.shields.io/badge/language-English-blue.svg)](./README-en-us.md)
[![](https://img.shields.io/badge/%C2%A5-%E8%B5%9E%E5%8A%A9-ff69b4.svg)](./assets/donate.md)
Expand All @@ -11,7 +11,7 @@

ๅŒๆ—ถ๏ผŒๆœฌไนฆๅœจไป‹็ป่ฟ™ไบ›็‰นๆ€ง็š„่ฟ‡็จ‹ไธญ๏ผŒๅฐฝๅฏ่ƒฝ็ฎ€ๅ•ๆ˜Žไบ†็š„ไป‹็ปไบ†่ฟ™ไบ›็‰นๆ€งไบง็”Ÿ็š„ๅŽ†ๅฒ่ƒŒๆ™ฏๅ’ŒๆŠ€ๆœฏ้œ€ๆฑ‚๏ผŒ่ฟ™ไธบ็†่งฃ่ฟ™ไบ›็‰นๆ€งใ€่ฟ็”จ่ฟ™ไบ›็‰นๆ€งๆไพ›ไบ†ๅพˆๅคง็š„ๅธฎๅŠฉใ€‚

ๆญคๅค–๏ผŒ็ฌ”่€…ๅธŒๆœ›่ฏป่€…ๅœจ้˜…่ฏปๆœฌไนฆๅŽ๏ผŒ่ƒฝๅคŸๅŠชๅŠ›ๅœจๆ–ฐ้กน็›ฎไธญ็›ดๆŽฅไฝฟ็”จ C++17๏ผŒๅนถๅŠชๅŠ›ๅฐ†ๆ—ง้กน็›ฎ้€ๆญฅ่ฟ็งปๅˆฐ C++17ใ€‚ไนŸ็ฎ—ๆ˜ฏ็ฌ”่€…ไธบๆŽจ่ฟ›็Žฐไปฃ C++ ็š„ๆ™ฎๅŠ่ดก็Œฎไบ†ไธ€ไบ›็ปต่–„ไน‹ๅŠ›ใ€‚
ๆญคๅค–๏ผŒ็ฌ”่€…ๅธŒๆœ›่ฏป่€…ๅœจ้˜…่ฏปๆœฌไนฆๅŽ๏ผŒ่ƒฝๅคŸๅŠชๅŠ›ๅœจๆ–ฐ้กน็›ฎไธญ็›ดๆŽฅไฝฟ็”จ็Žฐไปฃ C++๏ผŒๅนถๅŠชๅŠ›ๅฐ†ๆ—ง้กน็›ฎ้€ๆญฅ่ฟ็งปๅˆฐ็Žฐไปฃ C++ใ€‚ไนŸ็ฎ—ๆ˜ฏ็ฌ”่€…ไธบๆŽจ่ฟ›็Žฐไปฃ C++ ็š„ๆ™ฎๅŠ่ดก็Œฎไบ†ไธ€ไบ›็ปต่–„ไน‹ๅŠ›ใ€‚

## ็›ฎๆ ‡่ฏป่€…

Expand Down
Binary file modified assets/cover-2nd-en.afphoto
Binary file not shown.
Binary file modified assets/cover-2nd-en.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/cover-2nd.afphoto
Binary file not shown.
Binary file modified assets/cover-2nd.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file added book/en-us/00-preface.md
Empty file.
58 changes: 30 additions & 28 deletions book/en-us/toc.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# C++ 11/14/17 On The Fly
# C++ 11/14/17/20 On The Fly

## Table of Contents

- [**Preface**](./00-preface.md)
- [**Chapter 01 Towards C++11/14/17**](./01-intro.md)
- [**Chapter 01 Towards Modern C++**](./01-intro.md)
+ 1.1 Deprecated Features
+ 1.2 Compatibility with C
+ Further Readings
Expand Down Expand Up @@ -39,69 +39,71 @@
- Explicit delete default function
- Strongly typed enumerations
- [**Chapter 03 Language Runtime Enhancements**](./03-runtime.md)
+ Lambda expression
+ 3.1 Lambda expression
+ Basics
+ Value capture
+ Reference capture
+ Implicit capture
+ Expression capture
+ Generic lambda
+ Function object wrapper
+ 3.2 Function object wrapper
+ std::function
+ std::bind/std::placeholder
+ rvalue reference
+ 3.3 rvalue reference
+ lvalue, rvalue, prvalue, xvalue
+ rvalue reference & lvalue reference
+ Move semantics
+ Perfect forwarding
- [**Chapter 04 Sandard Library: Containers**](./04-containers.md)
+ `std::array`
+ `std::forward_list`
+ `std::unordered_set`
+ `std::unordered_map`
+ `std::tuple`
+ 4.1 `std::array` and `std::forward_list`
+ 4.2 Unordered containers
+ `std::unordered_set`
+ `std::unordered_map`
+ 4.3 Tuples `std::tuple`
+ basic operation
+ runtime indexing
+ merge and iteration
- [**Chapter 05 Sandard Library: Pointers**](./05-pointers.md)
+ RAII and reference counting
+ `std::shared_ptr`
+ `std::unique_ptr`
+ `std::weak_ptr`
+ 5.1 RAII and reference counting
+ 5.2 `std::shared_ptr`
+ 5.3 `std::unique_ptr`
- [**Chapter 06 Sandard Library: Regular Expression**](./06-regex.md)
+ Regular Expression Introduction
+ 6.1 Regular Expression Introduction
+ Normal characters
+ Special characters
+ Determinative
+ `std::regex`
+ 6.2 `std::regex` and related
+ `std::regex`
+ `std::regex_match`
+ `std::match_results`
- [**Chapter 07 Sandard Library: Threads and Concurrency**](./07-thread.md)
+ `std::thread`
+ `std::mutex`
+ `std::unique_lock`
+ `std::future`
+ `std::packaged_task`
+ `std::condition_variable`
+ 7.1 `std::thread`
+ 7.2 `std::mutex` and `std::unique_lock`
+ 7.3 `std::future` and `std::packaged_task`
+ 7.4 `std::condition_variable`
+ 7.5 `std::atomic` and memory order
+ 7.6 Transactional memory
- [**Chapter 08 Sandard Library: File System**](./08-filesystem.md)
+ 8.1 Documents and links
+ 8.2 `std::filesystem`
- [**Chapter 09 Minor Features**](./09-others.md)
+ New Types
+ 9.1 New Types
+ `long long int`
+ `noexcept`
+ Literal
+ 9.2 `noexcept` and its operates
+ 9.3 Literal
+ Raw string literal
+ Custom string literal
+ Math Library
+ 9.4 Math Library
- [**Chapter 10 Outlook: Introduction of C++20**](./10-cpp20.md)
+ Concept
+ Range
+ Module
+ Coroutine
- [**Appendix: Further Study Materials**](./appendix.md)
- [**Appendix 1: Further Study Materials**](./appendix1.md)
- [**Appendix 2: Modern C++ Best Practices**](./appendix2.md)

Table of Content | Last Chapter | [Next Chapter: Preface](./00-preface.md)

## Licenses

<a rel="license" href="http://creativecommons.org/licenses/by-nc-nd/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by-nc-nd/4.0/88x31.png" /></a><br />This work is written by [Ou Changkun](https://changkun.de) and licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-nc-nd/4.0/">Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License</a>. The code of this repository is open sourced under the [MIT license](./LICENSE).
<a rel="license" href="http://creativecommons.org/licenses/by-nc-nd/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by-nc-nd/4.0/88x31.png" /></a><br />This work was written by [Ou Changkun](https://changkun.de) and licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-nc-nd/4.0/">Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License</a>. The code of this repository is open sourced under the [MIT license](./LICENSE).
6 changes: 3 additions & 3 deletions book/zh-cn/00-preface.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ order: 0
## ๅผ•่จ€

C++ ๆ˜ฏไธ€ไธช็”จๆˆท็พคไฝ“็›ธๅฝ“ๅคง็š„่ฏญ่จ€ใ€‚ไปŽ C++98 ็š„ๅ‡บ็Žฐๅˆฐ C++11 ็š„ๆญฃๅผๅฎš็จฟ็ปๅŽ†ไบ†้•ฟ่พพๅๅนดๅคšไน‹ไน…็š„็งฏ็ดฏใ€‚C++14/17 ๅˆ™ๆ˜ฏไฝœไธบๅฏน C++11 ็š„้‡่ฆ่กฅๅ……ๅ’Œไผ˜ๅŒ–๏ผŒๆ‰€ๆœ‰่ฟ™ไบ›ๆ–ฐๆ ‡ๅ‡†ไธญๆ‰ฉๅ……็š„็‰นๆ€ง๏ผŒ็ป™ C++ ่ฟ™้—จ่ฏญ่จ€ๆณจๅ…ฅไบ†ๆ–ฐ็š„ๆดปๅŠ›ใ€‚
้‚ฃไบ›่ฟ˜ๅœจๅšๆŒไฝฟ็”จ**ไผ ็ปŸ C++**๏ผˆๆœฌไนฆๆŠŠ C++98 ๅŠๅ…ถไน‹ๅ‰็š„ C++ ็‰นๆ€งๅ‡็งฐไน‹ไธบไผ ็ปŸ C++๏ผ‰่€ŒๆœชๆŽฅ่งฆ่ฟ‡ C++11/14/17 ็š„ C++ ็จ‹ๅบๅ‘˜ๅœจ่งๅˆฐ่ฏธๅฆ‚ Lambda ่กจ่พพๅผ่ฟ™็ฑปๅ…จๆ–ฐ็‰นๆ€งๆ—ถ๏ผŒ็”š่‡ณไผšๆต้œฒๅ‡บใ€Žๅญฆ็š„ไธๆ˜ฏๅŒไธ€้—จ่ฏญ่จ€ใ€็š„ๆƒŠๅนไน‹ๆƒ…ใ€‚
้‚ฃไบ›่ฟ˜ๅœจๅšๆŒไฝฟ็”จ**ไผ ็ปŸ C++**๏ผˆๆœฌไนฆๆŠŠ C++98 ๅŠๅ…ถไน‹ๅ‰็š„ C++ ็‰นๆ€งๅ‡็งฐไน‹ไธบไผ ็ปŸ C++๏ผ‰่€ŒๆœชๆŽฅ่งฆ่ฟ‡ C++11/14/17/20 ็š„ C++ ็จ‹ๅบๅ‘˜ๅœจ่งๅˆฐ่ฏธๅฆ‚ Lambda ่กจ่พพๅผ่ฟ™็ฑปๅ…จๆ–ฐ็‰นๆ€งๆ—ถ๏ผŒ็”š่‡ณไผšๆต้œฒๅ‡บใ€Žๅญฆ็š„ไธๆ˜ฏๅŒไธ€้—จ่ฏญ่จ€ใ€็š„ๆƒŠๅนไน‹ๆƒ…ใ€‚

**C++1x** (ๆˆ–**็Žฐไปฃ C++**๏ผŒๆœฌไนฆไธญๅ‡ๆŒ‡ C++11/14/17) ไธบไผ ็ปŸ C++ ๆณจๅ…ฅ็š„ๅคง้‡็‰นๆ€งไฝฟๅพ—ๆ•ดไธช C++ ๅ˜ๅพ—ๆ›ดๅŠ ๅƒไธ€้—จ็ŽฐไปฃๅŒ–็š„่ฏญ่จ€ใ€‚C++1x ไธไป…ไป…ๅขžๅผบไบ† C++ ่ฏญ่จ€่‡ช่บซ็š„ๅฏ็”จๆ€ง๏ผŒ`auto` ๅ…ณ้”ฎๅญ—่ฏญไน‰็š„ไฟฎๆ”นไฝฟๅพ—ๆˆ‘ไปฌๆ›ดๅŠ ๆœ‰ไฟกๅฟƒๆฅๆ“ๆŽงๆžๅบฆๅคๆ‚็š„ๆจกๆฟ็ฑปๅž‹ใ€‚ๅŒๆ—ถ่ฟ˜ๅฏน่ฏญ่จ€่ฟ่กŒๆœŸ่ฟ›่กŒไบ†ๅคง้‡็š„ๅผบๅŒ–๏ผŒLambda ่กจ่พพๅผ็š„ๅ‡บ็Žฐ่ฎฉ C++ ๅ…ทๆœ‰ไบ†ใ€ŽๅŒฟๅๅ‡ฝๆ•ฐใ€็š„ใ€Ž้—ญๅŒ…ใ€็‰นๆ€ง๏ผŒ่€Œ่ฟ™ไธ€็‰นๆ€งๅ‡ ไนŽๅœจ็Žฐไปฃ็š„็ผ–็จ‹่ฏญ่จ€๏ผˆ่ฏธๅฆ‚ Python/Swift/... ๏ผ‰ไธญๅทฒ็ปๅธ็ฉบ่งๆƒฏ๏ผŒๅณๅ€ผๅผ•็”จ็š„ๅ‡บ็Žฐ่งฃๅ†ณไบ† C++ ้•ฟๆœŸไปฅๆฅ่ขซไบบ่ฏŸ็—…็š„ไธดๆ—ถๅฏน่ฑกๆ•ˆ็Ž‡้—ฎ้ข˜็ญ‰็ญ‰ใ€‚
**C++1x** (ๆˆ–**็Žฐไปฃ C++**๏ผŒๆœฌไนฆไธญๅ‡ๆŒ‡ C++11/14/17/20) ไธบไผ ็ปŸ C++ ๆณจๅ…ฅ็š„ๅคง้‡็‰นๆ€งไฝฟๅพ—ๆ•ดไธช C++ ๅ˜ๅพ—ๆ›ดๅŠ ๅƒไธ€้—จ็ŽฐไปฃๅŒ–็š„่ฏญ่จ€ใ€‚C++1x ไธไป…ไป…ๅขžๅผบไบ† C++ ่ฏญ่จ€่‡ช่บซ็š„ๅฏ็”จๆ€ง๏ผŒ`auto` ๅ…ณ้”ฎๅญ—่ฏญไน‰็š„ไฟฎๆ”นไฝฟๅพ—ๆˆ‘ไปฌๆ›ดๅŠ ๆœ‰ไฟกๅฟƒๆฅๆ“ๆŽงๆžๅบฆๅคๆ‚็š„ๆจกๆฟ็ฑปๅž‹ใ€‚ๅŒๆ—ถ่ฟ˜ๅฏน่ฏญ่จ€่ฟ่กŒๆœŸ่ฟ›่กŒไบ†ๅคง้‡็š„ๅผบๅŒ–๏ผŒLambda ่กจ่พพๅผ็š„ๅ‡บ็Žฐ่ฎฉ C++ ๅ…ทๆœ‰ไบ†ใ€ŽๅŒฟๅๅ‡ฝๆ•ฐใ€็š„ใ€Ž้—ญๅŒ…ใ€็‰นๆ€ง๏ผŒ่€Œ่ฟ™ไธ€็‰นๆ€งๅ‡ ไนŽๅœจ็Žฐไปฃ็š„็ผ–็จ‹่ฏญ่จ€๏ผˆ่ฏธๅฆ‚ Python/Swift/... ๏ผ‰ไธญๅทฒ็ปๅธ็ฉบ่งๆƒฏ๏ผŒๅณๅ€ผๅผ•็”จ็š„ๅ‡บ็Žฐ่งฃๅ†ณไบ† C++ ้•ฟๆœŸไปฅๆฅ่ขซไบบ่ฏŸ็—…็š„ไธดๆ—ถๅฏน่ฑกๆ•ˆ็Ž‡้—ฎ้ข˜็ญ‰็ญ‰ใ€‚

C++17 ๅˆ™ๆ˜ฏ่ฟ‘ไธ‰ๅนดไพ่ต– C++ ็คพๅŒบไธ€่‡ดๆŽจ่ฟ›็š„ๆ–นๅ‘๏ผŒไนŸๆŒ‡ๅ‡บไบ†**็ŽฐไปฃC++**็ผ–็จ‹็š„ไธ€ไธช้‡่ฆๅ‘ๅฑ•ๆ–นๅ‘ใ€‚ๅฐฝ็ฎกๅฎƒ็š„ๅ‡บ็Žฐๅนถไธๅฆ‚ C++11 ็š„ๅˆ†้‡ไน‹้‡๏ผŒไฝ†ๅฎƒๅŒ…ๅซไบ†ๅคง้‡ๅฐ่€Œ็พŽ็š„่ฏญ่จ€ไธŽ็‰นๆ€ง๏ผˆไพ‹ๅฆ‚็ป“ๆž„ๅŒ–็ป‘ๅฎš๏ผ‰๏ผŒ่ฟ™ไบ›็‰นๆ€ง็š„ๅ‡บ็Žฐๅ†ไธ€ๆฌกไฟฎๆญฃไบ†ๆˆ‘ไปฌๅœจ C++ ไธญ็š„็ผ–็จ‹่Œƒๅผใ€‚

Expand All @@ -36,7 +36,7 @@ C++17 ๅˆ™ๆ˜ฏ่ฟ‘ไธ‰ๅนดไพ่ต– C++ ็คพๅŒบไธ€่‡ดๆŽจ่ฟ›็š„ๆ–นๅ‘๏ผŒไนŸๆŒ‡ๅ‡บไบ†**็Žฐ

ๆœฌไนฆๆฏ็ซ ไธญ้ƒฝๅ‡บ็Žฐไบ†ๅคง้‡็š„ไปฃ็ ๏ผŒๅฆ‚ๆžœไฝ ๅœจ่ทŸ้šๆœฌไนฆไป‹็ป็‰นๆ€ง็š„ๆ€่ทฏ็ผ–ๅ†™่‡ชๅทฑ็š„ไปฃ็ ้‡ๅˆฐ้—ฎ้ข˜ๆ—ถ๏ผŒไธๅฆจ่ฏปไธ€่ฏป้šไนฆ้™„ไธŠ็š„ๆบ็ ๏ผŒไฝ ๅฏไปฅๅœจ[่ฟ™้‡Œ](../code)ไธญๆ‰พๅˆฐไนฆไธญไป‹็ป่ฟ‡็š„ๅ…จ้ƒจ็š„ๆบ็ ๏ผŒๆ‰€ๆœ‰ไปฃ็ ๆŒ‰็ซ ่Š‚็ป„็ป‡๏ผŒๆ–‡ไปถๅคนๅ็งฐไธบ็ซ ่Š‚ๅบๅทใ€‚

[่ฟ”ๅ›ž็›ฎๅฝ•](./toc.md) | ไธŠไธ€็ซ  | [ไธ‹ไธ€็ซ  ่ฟˆๅ‘ C++11/14/17](./01-intro.md)
[่ฟ”ๅ›ž็›ฎๅฝ•](./toc.md) | ไธŠไธ€็ซ  | [ไธ‹ไธ€็ซ  ่ฟˆๅ‘็Žฐไปฃ C++](./01-intro.md)

## ่ฎธๅฏ

Expand Down
4 changes: 2 additions & 2 deletions book/zh-cn/01-intro.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
---
title: ็ฌฌ 1 ็ซ  ่ฟˆๅ‘ C++11/14/17
title: ็ฌฌ 1 ็ซ  ่ฟˆๅ‘็Žฐไปฃ C++
type: book-zh-cn
order: 1
---

# ็ฌฌ 1 ็ซ  ่ฟˆๅ‘ C++11/14/17
# ็ฌฌ 1 ็ซ  ่ฟˆๅ‘็Žฐไปฃ C++

[TOC]

Expand Down
2 changes: 1 addition & 1 deletion book/zh-cn/02-usability.md
Original file line number Diff line number Diff line change
Expand Up @@ -931,7 +931,7 @@ std::cout << new_enum::value3 << std::endl

## ๆ€ป็ป“

ๆœฌ่Š‚ไป‹็ปไบ† C++11/14/17 ไธญๅฏน่ฏญ่จ€ๅฏ็”จๆ€ง็š„ๅขžๅผบ๏ผŒๅ…ถไธญ็ฌ”่€…่ฎคไธบๆœ€ไธบ้‡่ฆ็š„ๅ‡ ไธช็‰นๆ€งๆ˜ฏๅ‡ ไนŽๆ‰€ๆœ‰ไบบ้ƒฝ้œ€่ฆไบ†่งฃๅนถ็†Ÿ็ปƒไฝฟ็”จ็š„๏ผš
ๆœฌ่Š‚ไป‹็ปไบ† C++11/14/17/20 ไธญๅฏน่ฏญ่จ€ๅฏ็”จๆ€ง็š„ๅขžๅผบ๏ผŒๅ…ถไธญ็ฌ”่€…่ฎคไธบๆœ€ไธบ้‡่ฆ็š„ๅ‡ ไธช็‰นๆ€งๆ˜ฏๅ‡ ไนŽๆ‰€ๆœ‰ไบบ้ƒฝ้œ€่ฆไบ†่งฃๅนถ็†Ÿ็ปƒไฝฟ็”จ็š„๏ผš

1. auto ็ฑปๅž‹ๆŽจๅฏผ
2. ่Œƒๅ›ด for ่ฟญไปฃ
Expand Down
2 changes: 1 addition & 1 deletion book/zh-cn/10-cpp20.md
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ Concepts TS ็š„ๅ‘ๅธƒๅˆฐๆœ€ๅŽไธ€ๆฌก C++17 ็š„่ฎจ่ฎบไผšๅช็›ธ้š”ไบ†ไธๅˆฐๅ››ไธช
1. [Final features of C++17](https://meetingcpp.com/index.php/br/items/final-features-of-c17.html)
2. [C++17: will it be great or just ok?](https://codeplay.com/public/uploaded/filehost/0cbdaf_c++17post-oulu2016.pdf)
3. [Why Concepts didn't make C++17๏ผŸ](http://honermann.net/blog/2016/03/06/why-concepts-didnt-make-cxx17/)
4. [C++11/14/17 ็ผ–่ฏ‘ๅ™จๆ”ฏๆŒๆƒ…ๅ†ต](http://en.cppreference.com/w/cpp/compiler_support)
4. [C++11/14/17/20 ็ผ–่ฏ‘ๅ™จๆ”ฏๆŒๆƒ…ๅ†ต](http://en.cppreference.com/w/cpp/compiler_support)
## ่ฎธๅฏ
Expand Down
2 changes: 1 addition & 1 deletion book/zh-cn/appendix1.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ order: 11

้ฆ–ๅ…ˆ๏ผŒๆญๅ–œไฝ ้˜…่ฏปๅฎŒๆœฌไนฆ ๐ŸŽ‰ ๏ผ็ฌ”่€…ๅธŒๆœ›ๆœฌไนฆๆœ‰ๆ่ตทไฝ ๅฏน็Žฐไปฃ C++ ็š„ๅ…ด่ถฃใ€‚

ๆญฃๅฆ‚ๆœฌไนฆๅผ•่จ€้ƒจๅˆ†ๆๅˆฐ็š„๏ผŒๆœฌไนฆๅชๆ˜ฏไธ€ๆœฌๅธฆไฝ ๅฟซ้€Ÿ้ข†็•ฅ็Žฐไปฃ C++ 11/14/17 ๆ–ฐ็‰นๆ€ง็š„่ฏป็‰ฉ๏ผŒ่€Œ้ž่ฟ›้˜ถๅญฆไน ๅฎž่ทต C++ใ€Ž้ป‘้ญ”ๆณ•ใ€็š„ๅ†…ๅฎนใ€‚็ฌ”่€…ๅฝ“็„ถไนŸๆƒณๅˆฐไบ†่ฟ™ไธช้œ€ๆฑ‚๏ผŒๅชๆ˜ฏ่ฟ™ๆ ท็š„ๅ†…ๅฎน้žๅธธ่‰ฐๆทฑ๏ผŒ้ฒœๆœ‰ๅ—ไผ—ใ€‚ๅœจๆญค๏ผŒ็ฌ”่€…ๅˆ—ๅ‡บไธ€ไบ›่ƒฝๅคŸๅธฎๅŠฉไฝ ๅœจๆญคไนฆๅŸบ็ก€ไน‹ไธŠ่ฟ›ไธ€ๆญฅๅญฆไน ็Žฐไปฃ C++ ็š„่ต„ๆ–™๏ผŒๅธŒๆœ›่ƒฝๅคŸ็ฅไฝ ไธ€่‡‚ไน‹ๅŠ›๏ผš
ๆญฃๅฆ‚ๆœฌไนฆๅผ•่จ€้ƒจๅˆ†ๆๅˆฐ็š„๏ผŒๆœฌไนฆๅชๆ˜ฏไธ€ๆœฌๅธฆไฝ ๅฟซ้€Ÿ้ข†็•ฅ็Žฐไปฃ C++ 11/14/17/20 ๆ–ฐ็‰นๆ€ง็š„่ฏป็‰ฉ๏ผŒ่€Œ้ž่ฟ›้˜ถๅญฆไน ๅฎž่ทต C++ใ€Ž้ป‘้ญ”ๆณ•ใ€็š„ๅ†…ๅฎนใ€‚็ฌ”่€…ๅฝ“็„ถไนŸๆƒณๅˆฐไบ†่ฟ™ไธช้œ€ๆฑ‚๏ผŒๅชๆ˜ฏ่ฟ™ๆ ท็š„ๅ†…ๅฎน้žๅธธ่‰ฐๆทฑ๏ผŒ้ฒœๆœ‰ๅ—ไผ—ใ€‚ๅœจๆญค๏ผŒ็ฌ”่€…ๅˆ—ๅ‡บไธ€ไบ›่ƒฝๅคŸๅธฎๅŠฉไฝ ๅœจๆญคไนฆๅŸบ็ก€ไน‹ไธŠ่ฟ›ไธ€ๆญฅๅญฆไน ็Žฐไปฃ C++ ็š„่ต„ๆ–™๏ผŒๅธŒๆœ›่ƒฝๅคŸ็ฅไฝ ไธ€่‡‚ไน‹ๅŠ›๏ผš

- [C++ ๅ‚่€ƒ](http://en.cppreference.com/w)
- [CppCon YouTube ้ข‘้“](https://www.youtube.com/user/CppCon/videos)
Expand Down
8 changes: 4 additions & 4 deletions book/zh-cn/toc.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
# ้ซ˜้€ŸไธŠๆ‰‹ C++ 11/14/17

> ๆญฃๅœจๅ‘ๅ…จ้ขไป‹็ป C++17 ็‰นๆ€ง็š„ๅ†…ๅฎน่ฟ‡ๅบฆ
# ้ซ˜้€ŸไธŠๆ‰‹ C++ 11/14/17/20

## ็›ฎๅฝ•

- [**ๅบ่จ€**](./00-preface.md)
- [**็ฌฌ 1 ็ซ  ่ฟˆๅ‘ C++11/14/17**](./01-intro.md)
- [**็ฌฌ 1 ็ซ  ่ฟˆๅ‘็Žฐไปฃ C++**](./01-intro.md)
+ 1.1 ่ขซๅผƒ็”จ็š„็‰นๆ€ง
+ 1.2 ไธŽ C ็š„ๅ…ผๅฎนๆ€ง
+ ่ฟ›ไธ€ๆญฅ้˜…่ฏป็š„ๅ‚่€ƒๆ–‡็Œฎ
Expand Down Expand Up @@ -83,6 +81,8 @@
+ 7.2 `std::mutex` ๅ’Œ `std::unique_lock`
+ 7.3 `std::future` ๅ’Œ `std::packaged_task`
+ 7.4 `std::condition_variable`
+ 7.5 `std::atomic` ไธŽๅ†…ๅญ˜้กบๅบ
+ 7.6 ไบ‹ๅŠกๅ†…ๅญ˜
- [**็ฌฌ 8 ็ซ  ๆ ‡ๅ‡†ๅบ“: ๆ–‡ไปถ็ณป็ปŸ**](./08-filesystem.md)
+ 8.1 ๆ–‡ๆกฃไธŽ้“พๆŽฅ
+ 8.2 `std::filesystem`
Expand Down
2 changes: 1 addition & 1 deletion pdf/en-us/Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
title = 'C++11/14/17 On the Fly'
title = 'C++11/14/17/20 On the Fly'
filename = 'modern-cpp-tutorial'
outputname='modern-cpp-tutorial'
revision = $(shell git describe --always --tags)
Expand Down
2 changes: 1 addition & 1 deletion pdf/en-us/aggregator.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

with open('modern-cpp-tutorial.md', 'w') as outfile:
outfile.write("""---
title: "C++11/14/17 On the Fly"
title: "C++11/14/17/20 On the Fly"
author: Changkun Ou <hi@changkun.us>
copyright: cc-by-nc-nd 4.0
---
Expand Down
4 changes: 2 additions & 2 deletions pdf/en-us/meta/template.tex
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@
\thispagestyle{plain}
\begin{center}

{\LARGE\textbf{C++11/14/17 On the Fly}}
{\LARGE\textbf{C++11/14/17/20 On the Fly}}

\vspace{1em}
{\large Changkun Ou (hi@changkun.us)}
Expand All @@ -172,7 +172,7 @@
\vspace{1em}
\textbf{\large License}

\noindent This work is written by \href{https://github.com/changkun}{Ou Changkun} and licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License. \texttt{\small http://creativecommons.org/licenses/by-nc-nd/4.0/}
\noindent This work was written by \href{https://github.com/changkun}{Ou Changkun} and licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License. \texttt{\small http://creativecommons.org/licenses/by-nc-nd/4.0/}

\vspace{8em}
\includegraphics{../../assets/cover-2nd-en}
Expand Down
2 changes: 1 addition & 1 deletion pdf/zh-cn/Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
title = '้ซ˜้€ŸไธŠๆ‰‹ C++11/14/17'
title = '้ซ˜้€ŸไธŠๆ‰‹ C++11/14/17/20'
filename = 'modern-cpp-tutorial'
outputname='modern-cpp-tutorial'
revision = $(shell git describe --always --tags)
Expand Down
2 changes: 1 addition & 1 deletion pdf/zh-cn/aggregator.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

with open('modern-cpp-tutorial.md', 'w') as outfile:
outfile.write("""---
title: "้ซ˜้€ŸไธŠๆ‰‹ C++11/14/17"
title: "้ซ˜้€ŸไธŠๆ‰‹ C++11/14/17/20"
author: ๆฌง้•ฟๅค <hi@changkun.us>
copyright: cc-by-nc-nd 4.0
---
Expand Down
2 changes: 1 addition & 1 deletion pdf/zh-cn/meta/template.tex
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@
\thispagestyle{plain}
\begin{center}

{\LARGE\textbf{้ซ˜้€ŸไธŠๆ‰‹ C++11/14/17}}
{\LARGE\textbf{้ซ˜้€ŸไธŠๆ‰‹ C++11/14/17/20}}

\vspace{1em}
{\large ๆฌง้•ฟๅค (hi@changkun.us)}
Expand Down
2 changes: 1 addition & 1 deletion website/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# changkun.de/modern-cpp

Welcome to Modern C++ Tutorial! This site is built with [hexo](http://hexo.io/). Site content is written in Markdown format located in `../book`. And all static files will be built into `./public`, which is served by a nginx server at [changkun.de](https://changkun.de).
Welcome to Modern C++ Tutorial! This site is built with [hexo](http://hexo.io/). Site content was written in Markdown format located in `../book`. And all static files will be built into `./public`, which is served by a nginx server at [changkun.de](https://changkun.de).

## Requirements

Expand Down
4 changes: 2 additions & 2 deletions website/_config.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Site Configuration
title: ้ซ˜้€ŸไธŠๆ‰‹ C++ 11/14/17
subtitle: C++ 11/14/17 On the Fly
title: ้ซ˜้€ŸไธŠๆ‰‹ C++ 11/14/17/20
subtitle: C++ 11/14/17/20 On the Fly
description: "ๆฌง้•ฟๅค"
author: ๆฌง้•ฟๅค
email: hi[at]changkun.us
Expand Down
2 changes: 1 addition & 1 deletion website/themes/moderncpp/_config.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
site_description: "็Žฐไปฃ C++ | ้ซ˜้€ŸไธŠๆ‰‹ C++ 11/14/17"
site_description: "็Žฐไปฃ C++ | ้ซ˜้€ŸไธŠๆ‰‹ C++ 11/14/17/20"
google_analytics:
root_domain: changkun.de/modern-cpp
moderncpp_version: 2.0.0
2 changes: 1 addition & 1 deletion website/themes/moderncpp/layout/index.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</div><div class="right">
<h4>ๆฌง้•ฟๅค ่‘—</h4>
<h1>
้ซ˜้€ŸไธŠๆ‰‹<br>C++ 11/14/17
้ซ˜้€ŸไธŠๆ‰‹<br>C++ 11/14/17/20
</h1>
<h2>็ฌฌไบŒ็‰ˆ</h2>
<p>
Expand Down
4 changes: 2 additions & 2 deletions website/themes/moderncpp/layout/layout.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<!DOCTYPE html>
<html lang="en">
<head>
<title><%- page.title ? page.title : '' %> ้ซ˜้€ŸไธŠๆ‰‹ C++ 11/14/17 - C++ 11/14/17 On the Fly</title>
<title><%- page.title ? page.title : '' %> ้ซ˜้€ŸไธŠๆ‰‹ C++ 11/14/17/20 - C++ 11/14/17/20 On the Fly</title>
<meta charset="utf-8">
<meta name="description" content="<%- theme.site_description %>">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
Expand All @@ -23,7 +23,7 @@

</head>
<body class="<%- isIndex ? '' : 'docs' -%>">
<div id="mobile-bar" data-bg-text="้ซ˜้€ŸไธŠๆ‰‹ C++ 11/14/17" <%- isIndex ? 'class="top"' : '' %>>
<div id="mobile-bar" data-bg-text="้ซ˜้€ŸไธŠๆ‰‹ C++ 11/14/17/20" <%- isIndex ? 'class="top"' : '' %>>
<a class="menu-button"></a>
<a class="logo" href="/modern-cpp/"></a>
</div>
Expand Down
Loading

0 comments on commit 407148c

Please sign in to comment.