diff --git a/lib/Sema/SemaInherit.cpp b/lib/Sema/SemaInherit.cpp
index 1f3433e..f5c7a7f 100644
--- a/lib/Sema/SemaInherit.cpp
+++ b/lib/Sema/SemaInherit.cpp
@@ -41,13 +41,13 @@
   std::copy(Decls.begin(), Decls.end(), DeclsFound);
 }
 
-NamedDecl **BasePaths::found_decls_begin() {
+BasePaths::decl_iterator BasePaths::found_decls_begin() {
   if (NumDeclsFound == 0)
     ComputeDeclsFound();
   return DeclsFound;
 }
 
-NamedDecl **BasePaths::found_decls_end() {
+BasePaths::decl_iterator BasePaths::found_decls_end() {
   if (NumDeclsFound == 0)
     ComputeDeclsFound();
   return DeclsFound + NumDeclsFound;
diff --git a/lib/Sema/SemaInherit.h b/lib/Sema/SemaInherit.h
index 20c8ae5..a71ae8d 100644
--- a/lib/Sema/SemaInherit.h
+++ b/lib/Sema/SemaInherit.h
@@ -144,6 +144,7 @@
 
   public:
     typedef std::list<BasePath>::const_iterator paths_iterator;
+    typedef NamedDecl **decl_iterator;
     
     /// BasePaths - Construct a new BasePaths structure to record the
     /// paths for a derived-to-base search.
@@ -163,8 +164,8 @@
     BasePath&       front()       { return Paths.front(); }
     const BasePath& front() const { return Paths.front(); }
 
-    NamedDecl **found_decls_begin();
-    NamedDecl **found_decls_end();
+    decl_iterator found_decls_begin();
+    decl_iterator found_decls_end();
 
     bool isAmbiguous(QualType BaseType);