summaryrefslogtreecommitdiffstats
path: root/clang/test/SemaCXX/class.cpp
diff options
context:
space:
mode:
authorDouglas Gregor <dgregor@apple.com>2011-10-12 19:26:40 +0000
committerDouglas Gregor <dgregor@apple.com>2011-10-12 19:26:40 +0000
commit205d0445529eb985a1485ff8e2a18908f75f3bb1 (patch)
tree1946bda6471b8cbf87608d10ead284d1c7a2c122 /clang/test/SemaCXX/class.cpp
parentde2ff3b64ec0eea6a3974f5001917baeed24ec10 (diff)
downloadbcm5719-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/SemaCXX/class.cpp')
-rw-r--r--clang/test/SemaCXX/class.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/clang/test/SemaCXX/class.cpp b/clang/test/SemaCXX/class.cpp
index 52b062b5a71..160f365f4bb 100644
--- a/clang/test/SemaCXX/class.cpp
+++ b/clang/test/SemaCXX/class.cpp
@@ -34,12 +34,12 @@ public:
enum E1 { en1, en2 };
- int i = 0; // expected-warning {{in-class initialization of non-static data member accepted as a C++0x extension}}
+ int i = 0; // expected-warning {{in-class initialization of non-static data member accepted as a C++11 extension}}
static int si = 0; // expected-error {{non-const static data member must be initialized out of line}}
static const NestedC ci = 0; // expected-error {{static data member of type 'const C::NestedC' must be initialized out of line}}
static const int nci = vs; // expected-error {{in-class initializer is not a constant expression}}
static const int vi = 0;
- static const volatile int cvi = 0; // ok, illegal in C++0x
+ static const volatile int cvi = 0; // ok, illegal in C++11
static const E evi = 0;
void m() {
OpenPOWER on IntegriCloud