Address comments from Chris.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@47195 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/clang/AST/Attr.h b/include/clang/AST/Attr.h
index ae2c25b11b8f97bb7c399cd2c7881616bdce918d..c3390a021aa632b72d4a6e3808aa1df4ffd64446 100644 (file)
--- a/include/clang/AST/Attr.h
+++ b/include/clang/AST/Attr.h
@@ -14,7 +14,7 @@
 #ifndef LLVM_CLANG_AST_ATTR_H
 #define LLVM_CLANG_AST_ATTR_H
 
-#include <assert.h>
+#include <cassert>
 
 namespace clang {
 

diff --git a/include/clang/AST/Decl.h b/include/clang/AST/Decl.h
index 0fbf0f92855f6227b8d472189e0ecff710622ed9..bf8a214eb14d880cb2fd3485a17638483ce1315f 100644 (file)
--- a/include/clang/AST/Decl.h
+++ b/include/clang/AST/Decl.h
@@ -140,8 +140,8 @@ public:
 
   template<typename T> T *getAttr() {
     for (Attr *attr = getAttrs(); attr; attr = attr->getNext())
-      if (isa<T>(attr))
-        return cast<T>(attr);
+      if (T *V = dyn_cast<T>(attr))
+        return V;
 
     return 0;
   }