aboutsummaryrefslogtreecommitdiff
path: root/clang/lib/Sema/SemaStmt.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/Sema/SemaStmt.cpp
parente4b91dca91ab34958bd3109a7ef2ac528769a283 (diff)
downloadllvm-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/Sema/SemaStmt.cpp')
-rw-r--r--clang/lib/Sema/SemaStmt.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/Sema/SemaStmt.cpp b/clang/lib/Sema/SemaStmt.cpp
index 78c3c56..ab0bfcd 100644
--- a/clang/lib/Sema/SemaStmt.cpp
+++ b/clang/lib/Sema/SemaStmt.cpp
@@ -2855,7 +2855,7 @@ StmtResult Sema::BuildReturnStmt(SourceLocation ReturnLoc, Expr *RetValExp) {
// FIXME: Add a flag to the ScopeInfo to indicate whether we're performing
// deduction.
- if (getLangOpts().CPlusPlus1y) {
+ if (getLangOpts().CPlusPlus14) {
if (AutoType *AT = FnRetType->getContainedAutoType()) {
FunctionDecl *FD = cast<FunctionDecl>(CurContext);
if (DeduceFunctionTypeFromReturnExpr(FD, ReturnLoc, RetValExp, AT)) {