Merging r338942:

------------------------------------------------------------------------
r338942 | rsmith | 2018-08-04 03:02:00 +0200 (Sat, 04 Aug 2018) | 1 line

[www] Update cxx_status and cxx_dr_status now that Clang 7 has branched.
------------------------------------------------------------------------


git-svn-id: https://llvm.org/svn/llvm-project/cfe/branches/release_70@339002 91177308-0d34-0410-b5e6-96231b3b80d8

3 files changed, 15 insertions, 12 deletions

diff --git a/www/cxx_dr_status.html b/www/cxx_dr_status.html
index 04dd0eae1c..b96f71a619 100755
--- a/www/cxx_dr_status.html
+++ b/www/cxx_dr_status.html
@@ -2021,7 +2021,7 @@ of class templates</td>
     <td><a href="http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_defects.html#330">330</a></td>
     <td>CD4</td>
     <td>Qualification conversions and pointers to arrays of pointers</td>
-    <td class="svn" align="center">SVN</td>
+    <td class="svn" align="center">Clang 7</td>
   </tr>
   <tr id="331">
     <td><a href="http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_defects.html#331">331</a></td>
@@ -7093,7 +7093,7 @@ and <I>POD class</I></td>
     <td><a href="http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_defects.html#1213">1213</a></td>
     <td>CD3</td>
     <td>Array subscripting and xvalues</td>
-    <td class="svn" align="center">SVN</td>
+    <td class="svn" align="center">Clang 7</td>
   </tr>
   <tr id="1214">
     <td><a href="http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_defects.html#1214">1214</a></td>
@@ -9847,7 +9847,7 @@ and <I>POD class</I></td>
     <td><a href="http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_defects.html#1672">1672</a></td>
     <td>CD4</td>
     <td>Layout compatibility with multiple empty bases</td>
-    <td class="svn" align="center">SVN</td>
+    <td class="svn" align="center">Clang 7</td>
   </tr>
   <tr id="1673">
     <td><a href="http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_defects.html#1673">1673</a></td>
@@ -9937,7 +9937,7 @@ and <I>POD class</I></td>
     <td><a href="http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_defects.html#1687">1687</a></td>
     <td>C++14</td>
     <td>Conversions of operands of built-in operators</td>
-    <td class="svn" align="center">SVN</td>
+    <td class="svn" align="center">Clang 7</td>
   </tr>
   <tr id="1688">
     <td><a href="http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_closed.html#1688">1688</a></td>
@@ -9991,7 +9991,7 @@ and <I>POD class</I></td>
     <td><a href="http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_defects.html#1696">1696</a></td>
     <td>CD4</td>
     <td>Temporary lifetime and non-static data member initializers</td>
-    <td class="svn" align="center">SVN</td>
+    <td class="svn" align="center">Clang 7</td>
   </tr>
   <tr class="open" id="1697">
     <td><a href="http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_active.html#1697">1697</a></td>
@@ -10693,7 +10693,7 @@ and <I>POD class</I></td>
     <td><a href="http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_defects.html#1813">1813</a></td>
     <td>CD4</td>
     <td>Direct vs indirect bases in standard-layout classes</td>
-    <td class="svn" align="center">SVN</td>
+    <td class="svn" align="center">Clang 7</td>
   </tr>
   <tr id="1814">
     <td><a href="http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_defects.html#1814">1814</a></td>
@@ -11101,7 +11101,7 @@ and <I>POD class</I></td>
     <td><a href="http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_defects.html#1881">1881</a></td>
     <td>CD4</td>
     <td>Standard-layout classes and unnamed bit-fields</td>
-    <td class="svn" align="center">SVN</td>
+    <td class="svn" align="center">Clang 7</td>
   </tr>
   <tr id="1882">
     <td><a href="http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_defects.html#1882">1882</a></td>
@@ -12535,7 +12535,7 @@ and <I>POD class</I></td>
     <td><a href="http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_defects.html#2120">2120</a></td>
     <td>CD4</td>
     <td>Array as first non-static data member in standard-layout class</td>
-    <td class="svn" align="center">SVN</td>
+    <td class="svn" align="center">Clang 7</td>
   </tr>
   <tr class="open" id="2121">
     <td><a href="http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_active.html#2121">2121</a></td>
@@ -13189,7 +13189,7 @@ and <I>POD class</I></td>
     <td><a href="http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_active.html#2229">2229</a></td>
     <td>tentatively ready</td>
     <td>Volatile unnamed bit-fields</td>
-    <td class="svn" align="center">SVN</td>
+    <td class="svn" align="center">Clang 7</td>
   </tr>
   <tr id="2230">
     <td><a href="http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_closed.html#2230">2230</a></td>
diff --git a/www/cxx_status.html b/www/cxx_status.html
index b935e72186..ffc5fa5351 100755
--- a/www/cxx_status.html
+++ b/www/cxx_status.html
@@ -707,7 +707,7 @@ version 3.7.
       <tr>
         <!-- from Kona 2017 -->
         <td><a href="http://wg21.link/p0620r1">P0620R0</a> (<a href="#dr">DR</a>)</td>
-        <td class="svn" align="center">SVN</td>
+        <td class="svn" align="center">Clang 7</td>
       </tr>
       <tr>
         <!-- from Toronto 2017 -->
@@ -1026,7 +1026,7 @@ and library features that are not part of standard C++.</p>
     </tr>
     <tr>
       <td class="svn" align="center">
-        SVN (<a href="http://wg21.link/p0096r5">P0096R5</a>)</a>
+        Clang 7 (<a href="http://wg21.link/p0096r5">P0096R5</a>)</a>
       </td>
     </tr>
     <!-- FIXME: Implement latest recommendations.
diff --git a/www/make_cxx_dr_status b/www/make_cxx_dr_status
index 5b1991717d..af85c55af9 100755
--- a/www/make_cxx_dr_status
+++ b/www/make_cxx_dr_status
@@ -108,9 +108,12 @@ def availability(issue):
   if status == 'unknown':
     avail = 'Unknown'
     avail_style = ' class="none"'
-  elif status == '7':
+  elif status == '8':
     avail = 'SVN'
     avail_style = ' class="svn"'
+  elif status == '7':
+    avail = 'Clang 7'
+    avail_style = ' class="svn"'
   elif re.match('^[0-9]+\.?[0-9]*', status):
     avail = 'Clang %s' % status
     avail_style = ' class="full"'