summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLouis Dionne <ldionne@apple.com>2018-10-31 18:53:31 +0000
committerLouis Dionne <ldionne@apple.com>2018-10-31 18:53:31 +0000
commit7c7cac05ed936fad0cefc888d2f30ceb47291ff5 (patch)
tree11293df7e65b65a304130ba810edf0cad445488c
parenteeac12af6d3a8008eea13bcfd2f3c4b15474fe82 (diff)
downloadbcm5719-llvm-7c7cac05ed936fad0cefc888d2f30ceb47291ff5.tar.gz
bcm5719-llvm-7c7cac05ed936fad0cefc888d2f30ceb47291ff5.zip
[NFC] Replace C++1y and C++1z by C++14 and C++17, respectively
llvm-svn: 345762
-rw-r--r--libcxx/www/cxx1y_status.html9
-rw-r--r--libcxx/www/cxx1z_status.html6
2 files changed, 8 insertions, 7 deletions
diff --git a/libcxx/www/cxx1y_status.html b/libcxx/www/cxx1y_status.html
index 0bcd179de4c..0af6352e9d6 100644
--- a/libcxx/www/cxx1y_status.html
+++ b/libcxx/www/cxx1y_status.html
@@ -4,7 +4,7 @@
<html>
<head>
<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
- <title>libc++ C++1Y Status</title>
+ <title>libc++ C++14 Status</title>
<link type="text/css" rel="stylesheet" href="menu.css">
<link type="text/css" rel="stylesheet" href="content.css">
</head>
@@ -32,12 +32,13 @@
<div id="content">
<!--*********************************************************************-->
- <h1>libc++ C++1Y Status</h1>
+ <h1>libc++ C++14 Status</h1>
<!--*********************************************************************-->
- <p>In April 2013, the C++ standard committee approved the draft for the next version of the C++ standard, known as "C++1Y" (probably to be C++14)</p>
+ <p>In April 2013, the C++ standard committee approved the draft for the next version of the C++ standard, initially known as "C++1y".</p>
<p>The draft standard includes papers and issues that were voted on at the previous three meetings (Kona, Portland, and Bristol)</p>
- <p>This page shows the status of libc++; the status of clang's support of the language features is <a href="https://clang.llvm.org/cxx_status.html">here</a>.</p>
+ <p>In August 2014, this draft was approved by ISO as C++14</p>
+ <p>This page shows the status of libc++; the status of clang's support of the language features is <a href="https://clang.llvm.org/cxx_status.html#cxx14">here</a>.</p>
<p>The groups that have contributed papers:
<ul>
diff --git a/libcxx/www/cxx1z_status.html b/libcxx/www/cxx1z_status.html
index 4cbd02a5772..c2c6f7b0290 100644
--- a/libcxx/www/cxx1z_status.html
+++ b/libcxx/www/cxx1z_status.html
@@ -4,7 +4,7 @@
<html>
<head>
<meta http-equiv="content-type" content="text/html; charset=utf-8">
- <title>libc++ C++1Z Status</title>
+ <title>libc++ C++17 Status</title>
<link type="text/css" rel="stylesheet" href="menu.css">
<link type="text/css" rel="stylesheet" href="content.css">
</head>
@@ -32,10 +32,10 @@
<div id="content">
<!--*********************************************************************-->
- <h1>libc++ C++1z Status</h1>
+ <h1>libc++ C++17 Status</h1>
<!--*********************************************************************-->
- <p>In November 2014, the C++ standard committee created a draft for the next version of the C++ standard, known here as "C++1z" (probably to be C++17).</p>
+ <p>In November 2014, the C++ standard committee created a draft for the next version of the C++ standard, initially known as "C++1z".</p>
<p>In February 2017, the C++ standard committee approved this draft, and sent it to ISO for approval as C++17</p>
<p>This page shows the status of libc++; the status of clang's support of the language features is <a href="https://clang.llvm.org/cxx_status.html#cxx17">here</a>.</p>
OpenPOWER on IntegriCloud