diff options
| -rw-r--r-- | include/clang/AST/RecursiveASTVisitor.h | 9 | ||||
| -rw-r--r-- | include/clang/Lex/PPCallbacks.h | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/include/clang/AST/RecursiveASTVisitor.h b/include/clang/AST/RecursiveASTVisitor.h index 5a76fab396..527d46f430 100644 --- a/include/clang/AST/RecursiveASTVisitor.h +++ b/include/clang/AST/RecursiveASTVisitor.h @@ -995,17 +995,18 @@ DEF_TRAVERSE_DECL(FileScopeAsmDecl, { }) DEF_TRAVERSE_DECL(FriendDecl, { - // At most one of these two will be non-NULL. - TRY_TO(TraverseDecl(D->getFriendDecl())); + // Friend is either decl or a type. if (D->getFriendType()) TRY_TO(TraverseTypeLoc(D->getFriendType()->getTypeLoc())); + else + TRY_TO(TraverseDecl(D->getFriendDecl())); }) DEF_TRAVERSE_DECL(FriendTemplateDecl, { - // At most one of these two will be non-NULL. - TRY_TO(TraverseDecl(D->getFriendDecl())); if (D->getFriendType()) TRY_TO(TraverseTypeLoc(D->getFriendType()->getTypeLoc())); + else + TRY_TO(TraverseDecl(D->getFriendDecl())); for (unsigned I = 0, E = D->getNumTemplateParameters(); I < E; ++I) { TemplateParameterList *TPL = D->getTemplateParameterList(I); for (TemplateParameterList::iterator ITPL = TPL->begin(), diff --git a/include/clang/Lex/PPCallbacks.h b/include/clang/Lex/PPCallbacks.h index 10bf6779f4..1946515302 100644 --- a/include/clang/Lex/PPCallbacks.h +++ b/include/clang/Lex/PPCallbacks.h @@ -228,7 +228,7 @@ public: } /// Elif -- This hook is called whenever an #if is seen. - virtual void ElfIf(SourceRange Range) { + virtual void Elif(SourceRange Range) { First->Elif(Range); Second->Elif(Range); } |