From: Douglas Gregor Date: Sun, 10 May 2009 23:27:08 +0000 (+0000) Subject: With the introduction of nullptr, a template argument that refers to a declaration... X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=92d5077d35cb4ac7e3fdb5785fc4e843e9fffdc8;p=clang With the introduction of nullptr, a template argument that refers to a declaration can now be NULL. Use cast_or_null appropriately git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@71412 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/Sema/SemaTemplate.cpp b/lib/Sema/SemaTemplate.cpp index 0c91573180..0e1daea23c 100644 --- a/lib/Sema/SemaTemplate.cpp +++ b/lib/Sema/SemaTemplate.cpp @@ -1550,7 +1550,7 @@ bool Sema::CheckTemplateArgument(NonTypeTemplateParmDecl *Param, return true; if (Converted) { - Member = cast(Context.getCanonicalDecl(Member)); + Member = cast_or_null(Context.getCanonicalDecl(Member)); Converted->push_back(TemplateArgument(StartLoc, Member)); } @@ -1562,7 +1562,7 @@ bool Sema::CheckTemplateArgument(NonTypeTemplateParmDecl *Param, return true; if (Converted) { - Entity = cast(Context.getCanonicalDecl(Entity)); + Entity = cast_or_null(Context.getCanonicalDecl(Entity)); Converted->push_back(TemplateArgument(StartLoc, Entity)); } return false; @@ -1603,7 +1603,7 @@ bool Sema::CheckTemplateArgument(NonTypeTemplateParmDecl *Param, return true; if (Converted) { - Entity = cast(Context.getCanonicalDecl(Entity)); + Entity = cast_or_null(Context.getCanonicalDecl(Entity)); Converted->push_back(TemplateArgument(StartLoc, Entity)); } @@ -1679,7 +1679,7 @@ bool Sema::CheckTemplateArgument(NonTypeTemplateParmDecl *Param, return true; if (Converted) { - Member = cast(Context.getCanonicalDecl(Member)); + Member = cast_or_null(Context.getCanonicalDecl(Member)); Converted->push_back(TemplateArgument(StartLoc, Member)); }