diff options
| author | Brad King <brad.king@kitware.com> | 2015-01-19 21:40:56 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-01-19 21:40:56 (GMT) |
| commit | 445786964abe6519bd4695d982e0801a5dda35ce (patch) | |
| tree | 4e98428c3b649fb0ae3e8e0e054eab52eab4b298 | |
| parent | 5806f6c5e61fa1707ba1903a368e0e226477e4e4 (diff) | |
| parent | d8f93f6e9a4678385f6f2b8c108311e2fcdf376d (diff) | |
| download | CMake-445786964abe6519bd4695d982e0801a5dda35ce.zip CMake-445786964abe6519bd4695d982e0801a5dda35ce.tar.gz CMake-445786964abe6519bd4695d982e0801a5dda35ce.tar.bz2 | |
Merge branch 'doc-virtual-override-specifiers-links' into release
| -rw-r--r-- | Help/prop_gbl/CMAKE_CXX_KNOWN_FEATURES.rst | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Help/prop_gbl/CMAKE_CXX_KNOWN_FEATURES.rst b/Help/prop_gbl/CMAKE_CXX_KNOWN_FEATURES.rst index e24822c..163ae34 100644 --- a/Help/prop_gbl/CMAKE_CXX_KNOWN_FEATURES.rst +++ b/Help/prop_gbl/CMAKE_CXX_KNOWN_FEATURES.rst @@ -130,9 +130,11 @@ The features known to this version of CMake are: .. _N1987: http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2006/n1987.htm ``cxx_final`` - Override control ``final`` keyword, as defined in N2928_. + Override control ``final`` keyword, as defined in N2928_, N3206_ and N3272_. .. _N2928: http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2009/n2928.htm + .. _N3206: http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2010/n3206.htm + .. _N3272: http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2011/n3272.htm ``cxx_func_identifier`` Predefined ``__func__`` identifier, as defined in N2340_. @@ -195,9 +197,12 @@ The features known to this version of CMake are: .. _N2431: http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2431.pdf ``cxx_override`` - Override control ``override`` keyword, as defined in N2928_. + Override control ``override`` keyword, as defined in N2928_, N3206_ + and N3272_. .. _N2928: http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2009/n2928.htm + .. _N3206: http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2010/n3206.htm + .. _N3272: http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2011/n3272.htm ``cxx_range_for`` Range-based for, as defined in N2930_. |