diff options
| -rw-r--r-- | clang/lib/Sema/SemaTemplate.cpp | 4 | ||||
| -rw-r--r-- | clang/test/SemaTemplate/overload-candidates.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/clang/lib/Sema/SemaTemplate.cpp b/clang/lib/Sema/SemaTemplate.cpp index 1485b80cf95..c1205d7f03a 100644 --- a/clang/lib/Sema/SemaTemplate.cpp +++ b/clang/lib/Sema/SemaTemplate.cpp @@ -2843,7 +2843,7 @@ static Expr *lookThroughRangesV3Condition(Preprocessor &PP, Expr *Cond) { // With an inner '==' that has a literal on the right-hand side. Expr *LHS = BinOp->getLHS(); - auto InnerBinOp = dyn_cast<BinaryOperator>(LHS->IgnoreParenImpCasts()); + auto *InnerBinOp = dyn_cast<BinaryOperator>(LHS->IgnoreParenImpCasts()); if (!InnerBinOp) return Cond; if (InnerBinOp->getOpcode() != BO_EQ || @@ -2853,7 +2853,7 @@ static Expr *lookThroughRangesV3Condition(Preprocessor &PP, Expr *Cond) { // If the inner binary operation came from a macro expansion named // CONCEPT_REQUIRES or CONCEPT_REQUIRES_, return the right-hand side // of the '||', which is the real, user-provided condition. - auto Loc = InnerBinOp->getExprLoc(); + SourceLocation Loc = InnerBinOp->getExprLoc(); if (!Loc.isMacroID()) return Cond; StringRef MacroName = PP.getImmediateMacroName(Loc); diff --git a/clang/test/SemaTemplate/overload-candidates.cpp b/clang/test/SemaTemplate/overload-candidates.cpp index 8e0ddb0a5e4..de998d74f9a 100644 --- a/clang/test/SemaTemplate/overload-candidates.cpp +++ b/clang/test/SemaTemplate/overload-candidates.cpp @@ -157,7 +157,7 @@ namespace PR15673 { #if __cplusplus <= 199711L // expected-warning@+4 {{default template arguments for a function template are a C++11 extension}} - // expected-warning@+4 {{default template arguments for a function template are a C++11 extension}} + // expected-warning@+3 {{default template arguments for a function template are a C++11 extension}} #endif template<typename T, CONCEPT_REQUIRES_(some_passing_trait<T>::value && some_trait<T>::value)> |
