diff options
author | David Blaikie <dblaikie@gmail.com> | 2016-01-15 23:43:34 +0000 |
---|---|---|
committer | David Blaikie <dblaikie@gmail.com> | 2016-01-15 23:43:34 +0000 |
commit | efdccaa94fc1d0848c3f4a5a75aa533f2c79bc39 (patch) | |
tree | 29b3ddd7a0a157da58ec81201deac017c36a6ce5 /clang/lib/Parse/ParseTemplate.cpp | |
parent | e20506d1e442de1c64b7c6241809be9d1cfe1e8b (diff) | |
download | bcm5719-llvm-efdccaa94fc1d0848c3f4a5a75aa533f2c79bc39.tar.gz bcm5719-llvm-efdccaa94fc1d0848c3f4a5a75aa533f2c79bc39.zip |
OpaquePtr: Use nullptr construction for ParsedType OpaquePtr typedef
llvm-svn: 257958
Diffstat (limited to 'clang/lib/Parse/ParseTemplate.cpp')
-rw-r--r-- | clang/lib/Parse/ParseTemplate.cpp | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/clang/lib/Parse/ParseTemplate.cpp b/clang/lib/Parse/ParseTemplate.cpp index a4dcdb1e2a0..098ac6836fd 100644 --- a/clang/lib/Parse/ParseTemplate.cpp +++ b/clang/lib/Parse/ParseTemplate.cpp @@ -1061,7 +1061,7 @@ void Parser::AnnotateTemplateIdTokenAsType() { TemplateId->RAngleLoc); // Create the new "type" annotation token. Tok.setKind(tok::annot_typename); - setTypeAnnotation(Tok, Type.isInvalid() ? ParsedType() : Type.get()); + setTypeAnnotation(Tok, Type.isInvalid() ? nullptr : Type.get()); if (TemplateId->SS.isNotEmpty()) // it was a C++ qualified type name. Tok.setLocation(TemplateId->SS.getBeginLoc()); // End location stays the same @@ -1094,9 +1094,9 @@ ParsedTemplateArgument Parser::ParseTemplateTemplateArgument() { // followed by a token that terminates a template argument, such as ',', // '>', or (in some cases) '>>'. CXXScopeSpec SS; // nested-name-specifier, if present - ParseOptionalCXXScopeSpecifier(SS, ParsedType(), + ParseOptionalCXXScopeSpecifier(SS, nullptr, /*EnteringContext=*/false); - + ParsedTemplateArgument Result; SourceLocation EllipsisLoc; if (SS.isSet() && Tok.is(tok::kw_template)) { @@ -1117,11 +1117,10 @@ ParsedTemplateArgument Parser::ParseTemplateTemplateArgument() { // template argument. TemplateTy Template; if (isEndOfTemplateArgument(Tok) && - Actions.ActOnDependentTemplateName(getCurScope(), - SS, TemplateKWLoc, Name, - /*ObjectType=*/ ParsedType(), - /*EnteringContext=*/false, - Template)) + Actions.ActOnDependentTemplateName( + getCurScope(), SS, TemplateKWLoc, Name, + /*ObjectType=*/nullptr, + /*EnteringContext=*/false, Template)) Result = ParsedTemplateArgument(SS, Template, Name.StartLocation); } } else if (Tok.is(tok::identifier)) { @@ -1135,13 +1134,11 @@ ParsedTemplateArgument Parser::ParseTemplateTemplateArgument() { if (isEndOfTemplateArgument(Tok)) { bool MemberOfUnknownSpecialization; - TemplateNameKind TNK = Actions.isTemplateName(getCurScope(), SS, - /*hasTemplateKeyword=*/false, - Name, - /*ObjectType=*/ ParsedType(), - /*EnteringContext=*/false, - Template, - MemberOfUnknownSpecialization); + TemplateNameKind TNK = Actions.isTemplateName( + getCurScope(), SS, + /*hasTemplateKeyword=*/false, Name, + /*ObjectType=*/nullptr, + /*EnteringContext=*/false, Template, MemberOfUnknownSpecialization); if (TNK == TNK_Dependent_template_name || TNK == TNK_Type_template) { // We have an id-expression that refers to a class template or // (C++0x) alias template. |