[llvm-branch-commits] [cfe-branch] r226050 - Merging r226008:

[Hans Wennborg]

Author: hans
Date: Wed Jan 14 16:31:21 2015
New Revision: 226050

URL: http://llvm.org/viewvc/llvm-project?rev=226050&view=rev
Log:
Merging r226008:
------------------------------------------------------------------------
r226008 | hans | 2015-01-14 10:14:00 -0800 (Wed, 14 Jan 2015) | 1 line

Update cxx_dr_status.html after 3.6 branch
------------------------------------------------------------------------

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

Propchange: cfe/branches/release_36/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 14 16:31:21 2015
@@ -1,3 +1,4 @@
 /cfe/branches/type-system-rewrite:134693-134817
+/cfe/trunk:226008
 /cfe/trunk/test:170344
 /cfe/trunk/test/SemaTemplate:126920

Modified: cfe/branches/release_36/www/cxx_dr_status.html
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_36/www/cxx_dr_status.html?rev=226050&r1=226049&r2=226050&view=diff
==============================================================================
--- cfe/branches/release_36/www/cxx_dr_status.html (original)
+++ cfe/branches/release_36/www/cxx_dr_status.html Wed Jan 14 16:31:21 2015
@@ -6103,7 +6103,7 @@ and <I>POD class</I></td>
     <td><a href="http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_defects.html#1048">1048</a></td>
     <td>CD3</td>
     <td><TT>auto</TT> deduction and lambda return type deduction.</td>
-    <td class="svn" align="center">SVN</td>
+    <td class="full" align="center">Clang 3.6</td>
   </tr>
   <tr class="open" id="1049">
     <td><a href="http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_active.html#1049">1049</a></td>
@@ -9919,7 +9919,7 @@ and <I>POD class</I></td>
     <td><a href="http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_defects.html#1684">1684</a></td>
     <td>C++14</td>
     <td>Static <TT>constexpr</TT> member functions for non-literal classes</td>
-    <td class="svn" align="center">SVN</td>
+    <td class="full" align="center">Clang 3.6</td>
   </tr>
   <tr id="1685">
     <td><a href="http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_closed.html#1685">1685</a></td>
@@ -11161,7 +11161,7 @@ and <I>POD class</I></td>
     <td><a href="http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_defects.html#1891">1891</a></td>
     <td>DR</td>
     <td>Move constructor/assignment for closure class</td>
-    <td class="svn" align="center">SVN</td>
+    <td class="full" align="center">Clang 3.6</td>
   </tr>
   <tr id="1892">
     <td><a href="http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_defects.html#1892">1892</a></td>

Modified: cfe/branches/release_36/www/make_cxx_dr_status
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_36/www/make_cxx_dr_status?rev=226050&r1=226049&r2=226050&view=diff
==============================================================================
--- cfe/branches/release_36/www/make_cxx_dr_status (original)
+++ cfe/branches/release_36/www/make_cxx_dr_status Wed Jan 14 16:31:21 2015
@@ -102,10 +102,10 @@ def availability(issue):
   if status == 'unknown':
     avail = 'Unknown'
     avail_style = ' class="none"'
-  elif status == '3.6':
+  elif status == '3.7':
     avail = 'SVN'
     avail_style = ' class="svn"'
-  elif status in ('3.1', '3.2', '3.3', '3.4', '3.5'):
+  elif status in ('3.1', '3.2', '3.3', '3.4', '3.5', '3.6'):
     avail = 'Clang %s' % status
     avail_style = ' class="full"'
   elif status == 'yes':