Remove an unused parameter and include after r197273

llvm-svn: 197274
This commit is contained in:
Alp Toker 2013-12-13 21:19:30 +00:00
parent cbb9034e2a
commit 88f64e6aeb
4 changed files with 5 additions and 7 deletions

View File

@ -4219,8 +4219,8 @@ public:
SourceLocation RParen);
/// \brief Parsed one of the type trait support pseudo-functions.
ExprResult ActOnTypeTrait(TypeTrait Kind, unsigned Arity,
SourceLocation KWLoc, ArrayRef<ParsedType> Args,
ExprResult ActOnTypeTrait(TypeTrait Kind, SourceLocation KWLoc,
ArrayRef<ParsedType> Args,
SourceLocation RParenLoc);
ExprResult BuildTypeTrait(TypeTrait Kind, SourceLocation KWLoc,
ArrayRef<TypeSourceInfo *> Args,

View File

@ -1695,7 +1695,6 @@ static const char *getTypeTraitName(TypeTrait TT) {
switch (TT) {
#define TYPE_TRAIT_2(Spelling, Name, Key) \
case clang::BTT_##Name: return #Spelling;
#include "clang/Basic/TokenKinds.def"
#define TYPE_TRAIT_N(Spelling, Name, Key) \
case clang::TT_##Name: return #Spelling;
#include "clang/Basic/TokenKinds.def"

View File

@ -2800,8 +2800,7 @@ ExprResult Parser::ParseTypeTrait() {
return Actions.ActOnUnaryTypeTrait(UnaryTypeTraitFromTokKind(Kind), Loc,
Args[0], EndLoc);
return Actions.ActOnTypeTrait(TypeTraitFromTokKind(Kind), Arity, Loc, Args,
EndLoc);
return Actions.ActOnTypeTrait(TypeTraitFromTokKind(Kind), Loc, Args, EndLoc);
}
/// ParseArrayTypeTrait - Parse the built-in array type-trait

View File

@ -3734,8 +3734,8 @@ ExprResult Sema::BuildTypeTrait(TypeTrait Kind, SourceLocation KWLoc,
RParenLoc, Result);
}
ExprResult Sema::ActOnTypeTrait(TypeTrait Kind, unsigned Arity,
SourceLocation KWLoc, ArrayRef<ParsedType> Args,
ExprResult Sema::ActOnTypeTrait(TypeTrait Kind, SourceLocation KWLoc,
ArrayRef<ParsedType> Args,
SourceLocation RParenLoc) {
SmallVector<TypeSourceInfo *, 4> ConvertedArgs;
ConvertedArgs.reserve(Args.size());