[llvm-branch-commits] [cfe-branch] r257714 - Merging r257652 and r257695:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Wed Jan 13 17:48:11 2016
New Revision: 257714

URL: http://llvm.org/viewvc/llvm-project?rev=257714&view=rev
Log:
Merging r257652 and r257695:
------------------------------------------------------------------------
r257652 | hans | 2016-01-13 11:14:03 -0800 (Wed, 13 Jan 2016) | 1 line

Update cxx_dr_status.html after the 3.8 branch
------------------------------------------------------------------------

------------------------------------------------------------------------
r257695 | rsmith | 2016-01-13 14:51:59 -0800 (Wed, 13 Jan 2016) | 2 lines

Update make_cxx_dr_status after the 3.8 branch.

------------------------------------------------------------------------

Modified:
    cfe/branches/release_38/   (props changed)
    cfe/branches/release_38/www/cxx_dr_status.html
    cfe/branches/release_38/www/make_cxx_dr_status

Propchange: cfe/branches/release_38/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 13 17:48:11 2016
@@ -1,3 +1,4 @@
 /cfe/branches/type-system-rewrite:134693-134817
+/cfe/trunk:257652,257695
 /cfe/trunk/test:170344
 /cfe/trunk/test/SemaTemplate:126920

Modified: cfe/branches/release_38/www/cxx_dr_status.html
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_38/www/cxx_dr_status.html?rev=257714&r1=257713&r2=257714&view=diff
==============================================================================
--- cfe/branches/release_38/www/cxx_dr_status.html (original)
+++ cfe/branches/release_38/www/cxx_dr_status.html Wed Jan 13 17:48:11 2016
@@ -2483,7 +2483,7 @@ of class templates</td>
     <td><a href="http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_defects.html#407">407</a></td>
     <td>C++11</td>
     <td>Named class with associated typedef: two names or one?</td>
-    <td class="svn" align="center">SVN</td>
+    <td class="full" align="center">Clang 3.8</td>
   </tr>
   <tr id="408">
     <td><a href="http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_defects.html#408">408</a></td>

Modified: cfe/branches/release_38/www/make_cxx_dr_status
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_38/www/make_cxx_dr_status?rev=257714&r1=257713&r2=257714&view=diff
==============================================================================
--- cfe/branches/release_38/www/make_cxx_dr_status (original)
+++ cfe/branches/release_38/www/make_cxx_dr_status Wed Jan 13 17:48:11 2016
@@ -102,10 +102,10 @@ def availability(issue):
   if status == 'unknown':
     avail = 'Unknown'
     avail_style = ' class="none"'
-  elif status == '3.8':
+  elif status == '3.9':
     avail = 'SVN'
     avail_style = ' class="svn"'
-  elif status in ('3.1', '3.2', '3.3', '3.4', '3.5', '3.6', '3.7'):
+  elif status.startswith('3.'):
     avail = 'Clang %s' % status
     avail_style = ' class="full"'
   elif status == 'yes':