Mirrors/modern-cpp-tutorial
1
0
Fork 0
mirror of https://github.com/changkun/modern-cpp-tutorial.git synced 2025-12-17 12:44:40 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

book: fix indent typos (#117)

Browse Source
This commit is contained in:
changdingfang
2020-08-24 12:59:44 +08:00
committed by GitHub
parent 4de9eb49f7
commit 32bdf85ebd
3 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
book/en-us/07-thread.md
View File

@@ -314,6 +314,8 @@ struct A {
int y; int y;
long long z; long long z;
}; };
int main() {
std::atomic<A> a; std::atomic<A> a;
std::cout << std::boolalpha << a.is_lock_free() << std::endl; std::cout << std::boolalpha << a.is_lock_free() << std::endl;
return 0; return 0;
@@ -546,4 +548,4 @@ They provide an critical foundation for standardized high performance computing
## Licenses ## 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 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).` <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).`

14
book/zh-cn/04-containers.md
View File

@@ -186,14 +186,14 @@ Key:[3] Value:[3]
auto get_student(int id) auto get_student(int id)
{ {
// 返回类型被推断为 std::tuple<double, char, std::string> // 返回类型被推断为 std::tuple<double, char, std::string>
if (id == 0) if (id == 0)
return std::make_tuple(3.8, 'A', "张三"); return std::make_tuple(3.8, 'A', "张三");
if (id == 1) if (id == 1)
return std::make_tuple(2.9, 'C', "李四"); return std::make_tuple(2.9, 'C', "李四");
if (id == 2) if (id == 2)
return std::make_tuple(1.7, 'D', "王五"); return std::make_tuple(1.7, 'D', "王五");
return std::make_tuple(0.0, 'D', "null"); return std::make_tuple(0.0, 'D', "null");
// 如果只写 0 会出现推断错误, 编译失败 // 如果只写 0 会出现推断错误, 编译失败
} }

2
book/zh-cn/07-thread.md
View File

@@ -321,6 +321,8 @@ struct A {
int y; int y;
long long z; long long z;
}; };
int main() {
std::atomic<A> a; std::atomic<A> a;
std::cout << std::boolalpha << a.is_lock_free() << std::endl; std::cout << std::boolalpha << a.is_lock_free() << std::endl;
return 0; return 0;