summaryrefslogtreecommitdiffstats
path: root/clang/lib/AST/DeclCXX.cpp
diff options
context:
space:
mode:
authorAaron Ballman <aaron@aaronballman.com>2014-08-19 15:55:55 +0000
committerAaron Ballman <aaron@aaronballman.com>2014-08-19 15:55:55 +0000
commitdd69ef38dba72b08bee83f262fd443743940d2bc (patch)
tree7efceaf91a1ee1f236c89f129c908ca54739a9ce /clang/lib/AST/DeclCXX.cpp
parente4b91dca91ab34958bd3109a7ef2ac528769a283 (diff)
downloadbcm5719-llvm-dd69ef38dba72b08bee83f262fd443743940d2bc.tar.gz
bcm5719-llvm-dd69ef38dba72b08bee83f262fd443743940d2bc.zip
C++1y is now C++14!
Changes diagnostic options, language standard options, diagnostic identifiers, diagnostic wording to use c++14 instead of c++1y. It also modifies related test cases to use the updated diagnostic wording. llvm-svn: 215982
Diffstat (limited to 'clang/lib/AST/DeclCXX.cpp')
-rw-r--r--clang/lib/AST/DeclCXX.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/AST/DeclCXX.cpp b/clang/lib/AST/DeclCXX.cpp
index ed26c5262a7..0de15a538c2 100644
--- a/clang/lib/AST/DeclCXX.cpp
+++ b/clang/lib/AST/DeclCXX.cpp
@@ -720,7 +720,7 @@ void CXXRecordDecl::addedMember(Decl *D) {
// brace-or-equal-initializers for non-static data members.
//
// This rule was removed in C++1y.
- if (!getASTContext().getLangOpts().CPlusPlus1y)
+ if (!getASTContext().getLangOpts().CPlusPlus14)
data().Aggregate = false;
// C++11 [class]p10:
OpenPOWER on IntegriCloud