From 52c628afeda3b4fbc80377f162343228a1471c82 Mon Sep 17 00:00:00 2001 From: Ou Changkun Date: Tue, 3 Apr 2018 19:40:07 +0200 Subject: [PATCH 1/3] =?UTF-8?q?resolve=20#3,=20=E4=BF=AE=E6=AD=A3=20unorde?= =?UTF-8?q?r=5Fmap=20=E7=AC=94=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- book/4-containers.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/book/4-containers.md b/book/4-containers.md index c1168c7..4edc40a 100644 --- a/book/4-containers.md +++ b/book/4-containers.md @@ -70,7 +70,7 @@ std::sort(arr.begin(), arr.end()); C++11 引入了两组无序容器：`std::unordered_map`/`std::unordered_multimap` 和 `std::unordered_set`/`std::unordered_multiset`。 -它们的用法和原有的 `std::map`/`std::multimap`/`std::set`/`set::multiset` 基本类似，由于这些容器我们已经很熟悉了，便不一一举例，我们直接来比较一下`std::map`和`std::multimap`： +它们的用法和原有的 `std::map`/`std::multimap`/`std::set`/`set::multiset` 基本类似，由于这些容器我们已经很熟悉了，便不一一举例，我们直接来比较一下`std::map`和`std::unorder_map`： ```cpp #include @@ -248,4 +248,4 @@ std::cout << tuple_index(i, new_tuple) << std::endl; 知识共享许可协议 -本教程由[欧长坤](https://github.com/changkun)撰写，采用[知识共享署名-非商业性使用-禁止演绎 4.0 国际许可协议](http://creativecommons.org/licenses/by-nc-nd/4.0/)许可。项目中代码使用 MIT 协议开源，参见[许可](../LICENSE)。 \ No newline at end of file +本教程由[欧长坤](https://github.com/changkun)撰写，采用[知识共享署名-非商业性使用-禁止演绎 4.0 国际许可协议](http://creativecommons.org/licenses/by-nc-nd/4.0/)许可。项目中代码使用 MIT 协议开源，参见[许可](../LICENSE)。 From f3f4e02c17c5d8e8b8069ec9c565946a86f0dfaf Mon Sep 17 00:00:00 2001 From: Ou Changkun Date: Tue, 3 Apr 2018 19:41:02 +0200 Subject: [PATCH 2/3] =?UTF-8?q?add:=20=E5=A2=9E=E5=8A=A0=E8=87=B4=E8=B0=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 69ba456..3d5426b 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ 笔者感谢以下读者指出本书中出现的错误： -[Recolic Keghart](https://www.gitbook.com/@recolic), [sinomiko](https://www.gitbook.com/@sinomiko), [Wang Zhenhua](https://www.gitbook.com/@jackwish), [asm warrior](https://www.gitbook.com/@asmwarrior), [garicc](https://www.gitbook.com/@ihpy), [Wenhan Jiang](https://www.gitbook.com/@jiangwenhan), [liang xiao](https://www.gitbook.com/@liangx8) +[Recolic Keghart](https://www.gitbook.com/@recolic), [sinomiko](https://www.gitbook.com/@sinomiko), [Wang Zhenhua](https://www.gitbook.com/@jackwish), [asm warrior](https://www.gitbook.com/@asmwarrior), [garicc](https://www.gitbook.com/@ihpy), [Wenhan Jiang](https://www.gitbook.com/@jiangwenhan), [liang xiao](https://www.gitbook.com/@liangx8), [slivermeteor](https://github.com/slivermeteor) ## 赞助 From 176080cc1f09cdbe46250d3d74dd42757e6a5800 Mon Sep 17 00:00:00 2001 From: Ou Changkun Date: Tue, 3 Apr 2018 19:43:18 +0200 Subject: [PATCH 3/3] =?UTF-8?q?resolve=20#3,=20=E4=BF=AE=E6=94=B9=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- book/4-containers.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/book/4-containers.md b/book/4-containers.md index 4edc40a..fae515a 100644 --- a/book/4-containers.md +++ b/book/4-containers.md @@ -70,7 +70,7 @@ std::sort(arr.begin(), arr.end()); C++11 引入了两组无序容器：`std::unordered_map`/`std::unordered_multimap` 和 `std::unordered_set`/`std::unordered_multiset`。 -它们的用法和原有的 `std::map`/`std::multimap`/`std::set`/`set::multiset` 基本类似，由于这些容器我们已经很熟悉了，便不一一举例，我们直接来比较一下`std::map`和`std::unorder_map`： +它们的用法和原有的 `std::map`/`std::multimap`/`std::set`/`set::multiset` 基本类似，由于这些容器我们已经很熟悉了，便不一一举例，我们直接来比较一下`std::map`和`std::unordered_map`： ```cpp #include