diff options
| author | Douglas Gregor <dgregor@apple.com> | 2011-10-12 19:26:40 +0000 |
|---|---|---|
| committer | Douglas Gregor <dgregor@apple.com> | 2011-10-12 19:26:40 +0000 |
| commit | 205d0445529eb985a1485ff8e2a18908f75f3bb1 (patch) | |
| tree | 1946bda6471b8cbf87608d10ead284d1c7a2c122 /clang/test/CXX/class | |
| parent | de2ff3b64ec0eea6a3974f5001917baeed24ec10 (diff) | |
| download | bcm5719-llvm-205d0445529eb985a1485ff8e2a18908f75f3bb1.tar.gz bcm5719-llvm-205d0445529eb985a1485ff8e2a18908f75f3bb1.zip | |
Switch diagnostic text from "C++0x" over to "C++11".
We'd also like for "C++11" or "c++11" to be used for the warning
groups, but without removing the old warning flags. Patches welcome;
I've run out of time to work on this today.
llvm-svn: 141801
Diffstat (limited to 'clang/test/CXX/class')
| -rw-r--r-- | clang/test/CXX/class/class.friend/p2.cpp | 2 | ||||
| -rw-r--r-- | clang/test/CXX/class/class.friend/p6.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/clang/test/CXX/class/class.friend/p2.cpp b/clang/test/CXX/class/class.friend/p2.cpp index 87b69c095fb..fb3cd19b2b1 100644 --- a/clang/test/CXX/class/class.friend/p2.cpp +++ b/clang/test/CXX/class/class.friend/p2.cpp @@ -4,7 +4,7 @@ struct B0; class A { friend class B {}; // expected-error {{cannot define a type in a friend declaration}} - friend int; // expected-warning {{non-class friend type 'int' is a C++0x extension}} + friend int; // expected-warning {{non-class friend type 'int' is a C++11 extension}} friend B0; // expected-warning {{specify 'struct' to befriend 'B0'}} friend class C; // okay }; diff --git a/clang/test/CXX/class/class.friend/p6.cpp b/clang/test/CXX/class/class.friend/p6.cpp index 0b173b5b3f7..82a90ff82f2 100644 --- a/clang/test/CXX/class/class.friend/p6.cpp +++ b/clang/test/CXX/class/class.friend/p6.cpp @@ -3,7 +3,7 @@ class A { friend static class B; // expected-error {{'static' is invalid in friend declarations}} friend extern class C; // expected-error {{'extern' is invalid in friend declarations}} - friend auto class D; // expected-warning {{incompatible with C++0x}} expected-error {{'auto' is invalid in friend declarations}} + friend auto class D; // expected-warning {{incompatible with C++11}} expected-error {{'auto' is invalid in friend declarations}} friend register class E; // expected-error {{'register' is invalid in friend declarations}} friend mutable class F; // expected-error {{'mutable' is invalid in friend declarations}} friend typedef class G; // expected-error {{'typedef' is invalid in friend declarations}} |
