From 6a502a3bc72700d5db65f07ffcf1f11b67ca86db Mon Sep 17 00:00:00 2001 From: Anders Carlsson Date: Wed, 13 May 2009 21:22:06 +0000 Subject: [PATCH] Use an iterator type for found_decls_begin/found_decls_end. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@71721 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Sema/SemaInherit.cpp | 4 ++-- lib/Sema/SemaInherit.h | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/Sema/SemaInherit.cpp b/lib/Sema/SemaInherit.cpp index 1f3433e166..f5c7a7f2d0 100644 --- a/lib/Sema/SemaInherit.cpp +++ b/lib/Sema/SemaInherit.cpp @@ -41,13 +41,13 @@ void BasePaths::ComputeDeclsFound() { 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 20c8ae5e03..a71ae8dbab 100644 --- a/lib/Sema/SemaInherit.h +++ b/lib/Sema/SemaInherit.h @@ -144,6 +144,7 @@ namespace clang { public: typedef std::list::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 @@ namespace clang { 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); -- 2.40.0