summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--clang/test/CXX/drs/dr12xx.cpp18
-rw-r--r--clang/test/SemaCXX/virtual-override.cpp12
-rw-r--r--clang/www/cxx_dr_status.html2
3 files changed, 19 insertions, 13 deletions
diff --git a/clang/test/CXX/drs/dr12xx.cpp b/clang/test/CXX/drs/dr12xx.cpp
new file mode 100644
index 00000000000..048c21acde5
--- /dev/null
+++ b/clang/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/clang/test/SemaCXX/virtual-override.cpp b/clang/test/SemaCXX/virtual-override.cpp
index 42491178482..ec884f36323 100644
--- a/clang/test/SemaCXX/virtual-override.cpp
+++ b/clang/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/clang/www/cxx_dr_status.html b/clang/www/cxx_dr_status.html
index 9bf8f915fff..bebf895a326 100644
--- a/clang/www/cxx_dr_status.html
+++ b/clang/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>
OpenPOWER on IntegriCloud