commit 8165605dfb926561bcbc64310bec4106a70dd1e1
author David Blaikie <dblaikie@gmail.com> Tue May 01 19:49:42 2012 +0000
committer David Blaikie <dblaikie@gmail.com> Tue May 01 19:49:42 2012 +0000
tree 483a41bdba39017a04965fffc79cb852fd9d2514
parent f720a2bd5ac2130852a67b4ec1d79ed8f4d7f43e

Implement simplify_type traits for redecl_iterator.

Based on Chandler Carruth's feedback on r155869.

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

include/clang/AST/DeclBase.h

diff --git a/include/clang/AST/DeclBase.h b/include/clang/AST/DeclBase.h
index 555ce3c..6382bf3 100644
--- a/include/clang/AST/DeclBase.h
+++ b/include/clang/AST/DeclBase.h
@@ -1632,6 +1632,23 @@
   }
 };
 
+// simplify_type - Allow clients to treat redecl_iterators just like Decl
+// pointers when using casting operators.
+template<> struct simplify_type< ::clang::Decl::redecl_iterator> {
+  typedef ::clang::Decl *SimpleType;
+  static SimpleType getSimplifiedValue(const ::clang::Decl::redecl_iterator
+      &Val) {
+    return Val;
+  }
+};
+template<> struct simplify_type<const ::clang::Decl::redecl_iterator> {
+  typedef ::clang::Decl *SimpleType;
+  static SimpleType getSimplifiedValue(const ::clang::Decl::redecl_iterator
+      &Val) {
+    return Val;
+  }
+};
+
 } // end namespace llvm
 
 #endif

lib/Sema/SemaLookup.cpp

diff --git a/lib/Sema/SemaLookup.cpp b/lib/Sema/SemaLookup.cpp
index 3a6e290..78a9905 100644
--- a/lib/Sema/SemaLookup.cpp
+++ b/lib/Sema/SemaLookup.cpp
@@ -1069,7 +1069,7 @@
   
   for (Decl::redecl_iterator RD = D->redecls_begin(), RDEnd = D->redecls_end();
        RD != RDEnd; ++RD) {
-    if (NamedDecl *ND = dyn_cast<NamedDecl>(&*RD)) {
+    if (NamedDecl *ND = dyn_cast<NamedDecl>(RD)) {
       if (LookupResult::isVisible(ND))
         return ND;
     }