maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Fix test case in pre-C++11 mode; address Aaron Ballman's code review. 

llvm-svn: 307202
This commit is contained in:
Douglas Gregor 2017-07-05 21:12:37 +00:00
parent f70de9caa2
commit c0fe1f211a
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clang/lib/Sema/SemaTemplate.cpp
View File

@ -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);

2
clang/test/SemaTemplate/overload-candidates.cpp
View File

@ -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)>