Index: styleguide/c++/c++11.html |
diff --git a/styleguide/c++/c++11.html b/styleguide/c++/c++11.html |
index 7c3a42cc266303fc3ef2b8506e4c85dc97d93567..09ddfe0c471663f92f301f77854126fbff2461ce 100644 |
--- a/styleguide/c++/c++11.html |
+++ b/styleguide/c++/c++11.html |
@@ -468,6 +468,16 @@ std::basic_string::back</a></td> |
</tr> |
<tr> |
+<td>Tuples</td> |
+<td><code>std::tuple</code></td> |
+<td>A fixed-size ordered collection of values of mixed types</td> |
+<td><a href="http://en.cppreference.com/w/cpp/utility/tuple">std::tuple</a></td> |
+<td><a href="https://crbug.com/554987">Tracking bug</a> to plan moving from <code>base::Tuple</code> to <code>std::tuple</code>. See also <code>std::tie</code>. |
+<code>base::Tuple</code> is now an alias for <code>std::tuple</code>. In class template specializations, use <code>std::tuple</code> instead of <code>base::Tuple</code> to work around a MSVS2013 internal compiler error (Error code: C1001). |
+</td> |
+</tr> |
+ |
+<tr> |
<td>Unordered Associative Containers</td> |
<td><code>std::unordered_set</code>, <code>std::unordered_map</code>, |
<code>std::unordered_multiset</code>, and <code>std::unordered_multimap</code></td> |
@@ -479,13 +489,11 @@ and <a href="http://en.cppreference.com/w/cpp/container/unordered_set">std::unor |
</tr> |
<tr> |
-<td>Tuples</td> |
-<td><code>std::tuple</code></td> |
-<td>A fixed-size ordered collection of values of mixed types</td> |
-<td><a href="http://en.cppreference.com/w/cpp/utility/tuple">std::tuple</a></td> |
-<td><a href="https://crbug.com/554987">Tracking bug</a> to plan moving from <code>base::Tuple</code> to <code>std::tuple</code>. See also <code>std::tie</code>. |
-<code>base::Tuple</code> is now an alias for <code>std::tuple</code>. In class template specializations, use <code>std::tuple</code> instead of <code>base::Tuple</code> to work around a MSVS2013 internal compiler error (Error code: C1001). |
-</td> |
+<td>Unique Pointers</td> |
+<td><code>std::unique_ptr<<i>type</i>></code></td> |
+<td>A smart pointer with sole ownership of the owned object.</td> |
+<td><a href="http://en.cppreference.com/w/cpp/memory/unique_ptr">std::unique_ptr</a></td> |
+<td>Google style guide: <a href="https://google.github.io/styleguide/cppguide.html#Ownership_and_Smart_Pointers">Ownership and Smart Pointers</a>. <a href="https://groups.google.com/a/chromium.org/d/msg/cxx/aT2wsBLKvzI/oZuZ718oAwAJ">Discussion thread</a>. Use in all newly written code. scoped_ptr is a <a href="https://groups.google.com/a/chromium.org/d/msg/chromium-dev/roY78iTblYc/bb8nYsxfCgAJ">typedef for std::unique_ptr</a> and is going away shortly.</td> |
</tr> |
</tbody> |
@@ -1060,15 +1068,6 @@ within both associative and unordered containers</td> |
</tr> |
<tr> |
-<td>Unique Pointers</td> |
-<td><code>std::unique_ptr<<i>type</i>></code></td> |
-<td>Defines a pointer with clear and unambiguous ownership</td> |
-<td>TODO: documentation link</td> |
-<td><a href="https://google.github.io/styleguide/cppguide.html#Ownership_and_Smart_Pointers"> |
-Ownership and Smart Pointers</a></td> |
-</tr> |
- |
-<tr> |
<td>Variadic Copy Macro</td> |
<td><code>va_copy(va_list <i>dest</i>, va_list <i>src</i>)</code></td> |
<td>Makes a copy of the variadic function arguments</td> |