Merge branch 'master' of ssh://bitbucket.org/czan/honours

1 files changed, 25 insertions, 0 deletions

diff --git a/clang/test/Parser/cxx0x-override-control-keywords.cpp b/clang/test/Parser/cxx0x-override-control-keywords.cpp
new file mode 100644
index 0000000..444862a
--- /dev/null
+++ b/clang/test/Parser/cxx0x-override-control-keywords.cpp
@@ -0,0 +1,25 @@
+// RUN: %clang_cc1 -fsyntax-only -verify -std=c++11 %s
+
+struct Base {
+  virtual void override();
+};
+
+struct S : Base {
+  virtual void final() final;
+  virtual void override() override;
+};
+
+struct T {
+  // virt-specifier-seq is only valid in member-declarators, and a function definition is not a member-declarator.
+  // FIXME: This currently doesn't work.
+  // virtual void f() const override { } 
+};
+
+struct override;
+struct Base2 {
+  virtual override override(int override);
+};
+
+struct A : Base2 {
+  virtual struct override override(int override) override;
+};