From: David Majnemer <david.majnemer@gmail.com>
Date: Mon, 1 Feb 2016 01:33:17 +0000 (+0000)
Subject: Mark DR1250 as implemented
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b44c875824689afbc90e364b9987aff6703235f5;p=clang

Mark DR1250 as implemented

We implemented this DR back in r258768 but forgot to mark it as
implemented.

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

diff --git a/test/CXX/drs/dr12xx.cpp b/test/CXX/drs/dr12xx.cpp
new file mode 100644
index 0000000000..048c21acde
--- /dev/null
+++ b/test/CXX/drs/dr12xx.cpp
@@ -0,0 +1,18 @@
+// RUN: %clang_cc1 -std=c++98 %s -verify -fexceptions -fcxx-exceptions -pedantic-errors
+// RUN: %clang_cc1 -std=c++11 %s -verify -fexceptions -fcxx-exceptions -pedantic-errors
+// RUN: %clang_cc1 -std=c++14 %s -verify -fexceptions -fcxx-exceptions -pedantic-errors
+// RUN: %clang_cc1 -std=c++1z %s -verify -fexceptions -fcxx-exceptions -pedantic-errors
+
+// expected-no-diagnostics
+
+namespace dr1250 {  // dr1250: 3.9
+struct Incomplete;
+
+struct Base {
+  virtual const Incomplete *meow() = 0;
+};
+
+struct Derived : Base {
+  virtual Incomplete *meow();
+};
+} // dr1250
diff --git a/test/SemaCXX/virtual-override.cpp b/test/SemaCXX/virtual-override.cpp
index 4249117848..ec884f3632 100644
--- a/test/SemaCXX/virtual-override.cpp
+++ b/test/SemaCXX/virtual-override.cpp
@@ -289,15 +289,3 @@ namespace PR8168 {
     static void foo() {} // expected-error{{'static' member function 'foo' overrides a virtual function}}
   };
 }
-
-namespace PR26297 {
-struct Incomplete;
-
-struct Base {
-  virtual const Incomplete *meow() = 0;
-};
-
-struct Derived : Base {
-  virtual Incomplete *meow() override { return nullptr; }
-};
-}
diff --git a/www/cxx_dr_status.html b/www/cxx_dr_status.html
index 9bf8f915ff..bebf895a32 100644
--- a/www/cxx_dr_status.html
+++ b/www/cxx_dr_status.html
@@ -7315,7 +7315,7 @@ and <I>POD class</I></td>
     <td><a href="http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_defects.html#1250">1250</a></td>
     <td>CD3</td>
     <td>Cv-qualification of incomplete virtual function return types</td>
-    <td class="none" align="center">Unknown</td>
+    <td class="svn" align="center">SVN</td>
   </tr>
   <tr id="1251">
     <td><a href="http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_defects.html#1251">1251</a></td>