summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorredi <redi@138bc75d-0d04-0410-961f-82ee72b054a4>2016-08-05 13:57:30 +0000
committerredi <redi@138bc75d-0d04-0410-961f-82ee72b054a4>2016-08-05 13:57:30 +0000
commitd8ef4fa14d1b9ef2d7d7f3e9f4ea485a8329466d (patch)
tree3dd08680dc5daca80fe7717548762c405431ccbf
parentbbc6c232520c00b5d8e7a830334cdac2fb3dc74f (diff)
downloadgcc-d8ef4fa14d1b9ef2d7d7f3e9f4ea485a8329466d.tar.gz
Correct status of __cpp_lib_enable_shared_from_this
* doc/xml/manual/status_cxx2017.xml: Correct shared_from_this status. * doc/html/manual/status.html: Regenerate. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@239171 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--libstdc++-v3/ChangeLog3
-rw-r--r--libstdc++-v3/doc/html/manual/status.html2
-rw-r--r--libstdc++-v3/doc/xml/manual/status_cxx2017.xml2
3 files changed, 5 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index b5516d6745f..e6bf4c95d70 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,8 @@
2016-08-05 Jonathan Wakely <jwakely@redhat.com>
+ * doc/xml/manual/status_cxx2017.xml: Correct shared_from_this status.
+ * doc/html/manual/status.html: Regenerate.
+
* include/std/chrono (floor, ceil, round, abs): New for C++17.
* testsuite/20_util/duration_cast/rounding.cc: New test.
* testsuite/20_util/time_point_cast/rounding.cc: New test.
diff --git a/libstdc++-v3/doc/html/manual/status.html b/libstdc++-v3/doc/html/manual/status.html
index ada3d688ac9..c690cf3ac91 100644
--- a/libstdc++-v3/doc/html/manual/status.html
+++ b/libstdc++-v3/doc/html/manual/status.html
@@ -558,7 +558,7 @@ Feature-testing recommendations for C++</a>.
<a class="link" href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2016/p0033r1.html" target="_top">
P0033R1
</a>
- </td><td align="center"> 6.1 </td><td align="left"><code class="code">__cpp_lib_enable_shared_from_this &gt;= 201603</code></td></tr><tr><td align="left"> A proposal to add <code class="code">invoke</code> function template </td><td align="left">
+ </td><td align="center"> 7 </td><td align="left"><code class="code">__cpp_lib_enable_shared_from_this &gt;= 201603</code></td></tr><tr><td align="left"> A proposal to add <code class="code">invoke</code> function template </td><td align="left">
<a class="link" href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2014/n4169.html" target="_top">
N4169
</a>
diff --git a/libstdc++-v3/doc/xml/manual/status_cxx2017.xml b/libstdc++-v3/doc/xml/manual/status_cxx2017.xml
index 4d098d16baf..02aec2571f9 100644
--- a/libstdc++-v3/doc/xml/manual/status_cxx2017.xml
+++ b/libstdc++-v3/doc/xml/manual/status_cxx2017.xml
@@ -261,7 +261,7 @@ Feature-testing recommendations for C++</link>.
P0033R1
</link>
</entry>
- <entry align="center"> 6.1 </entry>
+ <entry align="center"> 7 </entry>
<entry><code>__cpp_lib_enable_shared_from_this >= 201603</code></entry>
</row>