diff options
| author | Saar Raz <saar@raz.email> | 2020-01-19 00:45:25 +0200 |
|---|---|---|
| committer | Saar Raz <saar@raz.email> | 2020-01-19 00:45:25 +0200 |
| commit | e68c1e00eba4ae64d38e62eebebd581e3d3d6bd4 (patch) | |
| tree | 9d87c0a4c5d5e2acbae30dce81c08d1dcb4ea20b /clang/lib/Parse/ParseDecl.cpp | |
| parent | a0f50d731639350c7a79f140f026c27a18215531 (diff) | |
| download | llvm-e68c1e00eba4ae64d38e62eebebd581e3d3d6bd4.zip llvm-e68c1e00eba4ae64d38e62eebebd581e3d3d6bd4.tar.gz llvm-e68c1e00eba4ae64d38e62eebebd581e3d3d6bd4.tar.bz2 | |
[Concepts] Fix name-type conflict compilation issues
D50360 caused some platforms to not compile due to a parameter with the name of a type.
Rename the parameter.
Diffstat (limited to 'clang/lib/Parse/ParseDecl.cpp')
| -rw-r--r-- | clang/lib/Parse/ParseDecl.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/clang/lib/Parse/ParseDecl.cpp b/clang/lib/Parse/ParseDecl.cpp index 178cb1b..065a82b 100644 --- a/clang/lib/Parse/ParseDecl.cpp +++ b/clang/lib/Parse/ParseDecl.cpp @@ -6612,7 +6612,7 @@ void Parser::ParseFunctionDeclaratorIdentifierList( /// [C++11] attribute-specifier-seq parameter-declaration /// void Parser::ParseParameterDeclarationClause( - DeclaratorContext DeclaratorContext, + DeclaratorContext DeclaratorCtx, ParsedAttributes &FirstArgAttrs, SmallVectorImpl<DeclaratorChunk::ParamInfo> &ParamInfo, SourceLocation &EllipsisLoc) { @@ -6661,9 +6661,9 @@ void Parser::ParseParameterDeclarationClause( // "LambdaExprParameterContext", because we must accept either // 'declarator' or 'abstract-declarator' here. Declarator ParmDeclarator( - DS, DeclaratorContext == DeclaratorContext::RequiresExprContext + DS, DeclaratorCtx == DeclaratorContext::RequiresExprContext ? DeclaratorContext::RequiresExprContext - : DeclaratorContext == DeclaratorContext::LambdaExprContext + : DeclaratorCtx == DeclaratorContext::LambdaExprContext ? DeclaratorContext::LambdaExprParameterContext : DeclaratorContext::PrototypeContext); ParseDeclarator(ParmDeclarator); @@ -6719,7 +6719,7 @@ void Parser::ParseParameterDeclarationClause( SourceLocation EqualLoc = Tok.getLocation(); // Parse the default argument - if (DeclaratorContext == DeclaratorContext::MemberContext) { + if (DeclaratorCtx == DeclaratorContext::MemberContext) { // If we're inside a class definition, cache the tokens // corresponding to the default argument. We'll actually parse // them when we see the end of the class definition. |