summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--clang/include/clang/Basic/DiagnosticParseKinds.td2
-rw-r--r--clang/lib/Parse/ParseDeclCXX.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/clang/include/clang/Basic/DiagnosticParseKinds.td b/clang/include/clang/Basic/DiagnosticParseKinds.td
index 73437b217b1..4b2343ddaa2 100644
--- a/clang/include/clang/Basic/DiagnosticParseKinds.td
+++ b/clang/include/clang/Basic/DiagnosticParseKinds.td
@@ -471,7 +471,7 @@ def warn_defaulted_function_accepted_as_extension: ExtWarn<
InGroup<CXX11>;
// C++11 in-class member initialization
-def warn_nonstatic_member_init_accepted_as_extension: ExtWarn<
+def ext_nonstatic_member_init : ExtWarn<
"in-class initialization of non-static data member accepted as a C++11 extension">,
InGroup<CXX11>;
def err_bitfield_member_init: Error<
diff --git a/clang/lib/Parse/ParseDeclCXX.cpp b/clang/lib/Parse/ParseDeclCXX.cpp
index 358aec62ecf..ceb988db9bb 100644
--- a/clang/lib/Parse/ParseDeclCXX.cpp
+++ b/clang/lib/Parse/ParseDeclCXX.cpp
@@ -1885,7 +1885,7 @@ void Parser::ParseCXXClassMemberDeclaration(AccessSpecifier AS,
if (HasDeferredInitializer) {
// The initializer was deferred; parse it and cache the tokens.
if (!getLang().CPlusPlus0x)
- Diag(Tok, diag::warn_nonstatic_member_init_accepted_as_extension);
+ Diag(Tok, diag::ext_nonstatic_member_init);
if (DeclaratorInfo.isArrayOfUnknownBound()) {
// C++0x [dcl.array]p3: An array bound may also be omitted when the
OpenPOWER on IntegriCloud