[cfe-commits] r71412 - /cfe/trunk/lib/Sema/SemaTemplate.cpp

[Douglas Gregor]

Author: dgregor
Date: Sun May 10 18:27:08 2009
New Revision: 71412

URL: http://llvm.org/viewvc/llvm-project?rev=71412&view=rev
Log:
With the introduction of nullptr, a template argument that refers to a 
declaration can now be NULL. Use cast_or_null appropriately

Modified:
    cfe/trunk/lib/Sema/SemaTemplate.cpp

Modified: cfe/trunk/lib/Sema/SemaTemplate.cpp
URL: 
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaTemplate.cpp?rev=71412&r1=71411&r2=71412&view=diff

==============================================================================
--- cfe/trunk/lib/Sema/SemaTemplate.cpp (original)
+++ cfe/trunk/lib/Sema/SemaTemplate.cpp Sun May 10 18:27:08 2009
@@ -1550,7 +1550,7 @@
         return true;
 
       if (Converted) {
-        Member = cast<NamedDecl>(Context.getCanonicalDecl(Member));
+        Member = cast_or_null<NamedDecl>(Context.getCanonicalDecl(Member));
         Converted->push_back(TemplateArgument(StartLoc, Member));
       }
 
@@ -1562,7 +1562,7 @@
       return true;
 
     if (Converted) {
-      Entity = cast<NamedDecl>(Context.getCanonicalDecl(Entity));
+      Entity = cast_or_null<NamedDecl>(Context.getCanonicalDecl(Entity));
       Converted->push_back(TemplateArgument(StartLoc, Entity));
     }
     return false;
@@ -1603,7 +1603,7 @@
       return true;
 
     if (Converted) {
-      Entity = cast<NamedDecl>(Context.getCanonicalDecl(Entity));
+      Entity = cast_or_null<NamedDecl>(Context.getCanonicalDecl(Entity));
       Converted->push_back(TemplateArgument(StartLoc, Entity));
     }
 
@@ -1679,7 +1679,7 @@
     return true;
   
   if (Converted) {
-    Member = cast<NamedDecl>(Context.getCanonicalDecl(Member));
+    Member = cast_or_null<NamedDecl>(Context.getCanonicalDecl(Member));
     Converted->push_back(TemplateArgument(StartLoc, Member));
   }
 


_______________________________________________
cfe-commits mailing list
cfe-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits