diff options
| author | Aaron Ballman <aaron@aaronballman.com> | 2014-08-19 15:55:55 +0000 |
|---|---|---|
| committer | Aaron Ballman <aaron@aaronballman.com> | 2014-08-19 15:55:55 +0000 |
| commit | dd69ef38dba72b08bee83f262fd443743940d2bc (patch) | |
| tree | 7efceaf91a1ee1f236c89f129c908ca54739a9ce /clang/lib/Parse/ParseDecl.cpp | |
| parent | e4b91dca91ab34958bd3109a7ef2ac528769a283 (diff) | |
| download | llvm-dd69ef38dba72b08bee83f262fd443743940d2bc.zip llvm-dd69ef38dba72b08bee83f262fd443743940d2bc.tar.gz llvm-dd69ef38dba72b08bee83f262fd443743940d2bc.tar.bz2 | |
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/Parse/ParseDecl.cpp')
| -rw-r--r-- | clang/lib/Parse/ParseDecl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/Parse/ParseDecl.cpp b/clang/lib/Parse/ParseDecl.cpp index 75bae65..7132b4a 100644 --- a/clang/lib/Parse/ParseDecl.cpp +++ b/clang/lib/Parse/ParseDecl.cpp @@ -5201,7 +5201,7 @@ void Parser::ParseFunctionDeclarator(Declarator &D, dyn_cast<CXXRecordDecl>(Actions.CurContext), DS.getTypeQualifiers() | (D.getDeclSpec().isConstexprSpecified() && - !getLangOpts().CPlusPlus1y + !getLangOpts().CPlusPlus14 ? Qualifiers::Const : 0), IsCXX11MemberFunction); |