diff options
| -rw-r--r-- | clang/include/clang/AST/Type.h | 10 | ||||
| -rw-r--r-- | clang/include/clang/Parse/Action.h | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/clang/include/clang/AST/Type.h b/clang/include/clang/AST/Type.h index 9c9c5af69af..c8024d43baf 100644 --- a/clang/include/clang/AST/Type.h +++ b/clang/include/clang/AST/Type.h @@ -1028,7 +1028,7 @@ public: class FunctionTypeNoProto : public FunctionType, public llvm::FoldingSetNode { FunctionTypeNoProto(QualType Result, QualType Canonical) : FunctionType(FunctionNoProto, Result, false, 0, Canonical, - /*Dependent=*/false) {} + /*Dependent=*/false) {} friend class ASTContext; // ASTContext creates these. public: // No additional state past what FunctionType provides. @@ -1062,7 +1062,7 @@ class FunctionTypeProto : public FunctionType, public llvm::FoldingSetNode { static bool hasAnyDependentType(const QualType *ArgArray, unsigned numArgs) { for (unsigned Idx = 0; Idx < numArgs; ++Idx) if (ArgArray[Idx]->isDependentType()) - return true; + return true; return false; } @@ -1070,8 +1070,8 @@ class FunctionTypeProto : public FunctionType, public llvm::FoldingSetNode { FunctionTypeProto(QualType Result, const QualType *ArgArray, unsigned numArgs, bool isVariadic, unsigned typeQuals, QualType Canonical) : FunctionType(FunctionProto, Result, isVariadic, typeQuals, Canonical, - (Result->isDependentType() || - hasAnyDependentType(ArgArray, numArgs))), + (Result->isDependentType() || + hasAnyDependentType(ArgArray, numArgs))), NumArgs(numArgs) { // Fill in the trailing argument array. QualType *ArgInfo = reinterpret_cast<QualType *>(this+1);; @@ -1447,7 +1447,7 @@ class ObjCQualifiedIdType : public Type, ObjCQualifiedIdType(ObjCProtocolDecl **Protos, unsigned NumP) : Type(ObjCQualifiedId, QualType()/*these are always canonical*/, - /*Dependent=*/false), + /*Dependent=*/false), Protocols(Protos, Protos+NumP) { } friend class ASTContext; // ASTContext creates these. public: diff --git a/clang/include/clang/Parse/Action.h b/clang/include/clang/Parse/Action.h index f78f4f38d14..42b4b7865fb 100644 --- a/clang/include/clang/Parse/Action.h +++ b/clang/include/clang/Parse/Action.h @@ -1160,8 +1160,8 @@ public: virtual DeclTy *ActOnProperty (Scope *S, SourceLocation AtLoc, FieldDeclarator &FD, ObjCDeclSpec &ODS, Selector GetterSel, Selector SetterSel, - DeclTy *ClassCategory, - bool *OverridingProperty, + DeclTy *ClassCategory, + bool *OverridingProperty, tok::ObjCKeywordKind MethodImplKind) { return 0; } |
