| Index: styleguide/c++/c++11.html
|
| diff --git a/styleguide/c++/c++11.html b/styleguide/c++/c++11.html
|
| index 8cd4315d6638a3db38573c0b84468afdf2bb7703..edebb9a727913e1e7f991892c61589253da2612a 100644
|
| --- a/styleguide/c++/c++11.html
|
| +++ b/styleguide/c++/c++11.html
|
| @@ -84,6 +84,18 @@ and <code><inttypes></code></td>
|
| <td>Already in common use in the codebase. Approved without discussion.</td>
|
| </tr>
|
|
|
| +<tr>
|
| +<td>Null Pointer Constant</td>
|
| +<td><code>nullptr</code></td>
|
| +<td>Declares a type-safe null pointer</td>
|
| +<td>TODO: documentation link</td>
|
| +<td>Recommended for new code.
|
| +<a href="https://groups.google.com/a/chromium.org/forum/#!topic/chromium-dev/4mijeJHzxLg">Discussion thread</a>.
|
| +<a href="https://google-styleguide.googlecode.com/svn/trunk/cppguide.html#0_and_nullptr/NULL">Google Style Guide</a>.
|
| +Note: <code>std::nullptr_t</code> is a library feature and not available.
|
| +</td>
|
| +</tr>
|
| +
|
| </tbody>
|
| </table>
|
|
|
| @@ -331,15 +343,6 @@ Non-static data members</a></td>
|
| </tr>
|
|
|
| <tr>
|
| -<td>Null Pointer Constant</td>
|
| -<td><code>nullptr</code></td>
|
| -<td>Declares a type-safe null pointer</td>
|
| -<td>TODO: documentation link</td>
|
| -<td><a href="https://google-styleguide.googlecode.com/svn/trunk/cppguide.html#0_and_nullptr/NULL">Google Style Guidwe</a>.
|
| -</td>
|
| -</tr>
|
| -
|
| -<tr>
|
| <td>Overrides</td>
|
| <td><code>override</code></td>
|
| <td>Indicates that a class or function overrides a base implementation</td>
|
|
|