add and use a callee_iterator typedef

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

diff --git a/include/llvm/Analysis/DataStructure/DataStructure.h b/include/llvm/Analysis/DataStructure/DataStructure.h
index 8e83f3037b164afa6f4621b162f33ef5d072b0c1..247e4800c53e94362512c656d01a7f8ca41de67e 100644 (file)
--- a/include/llvm/Analysis/DataStructure/DataStructure.h
+++ b/include/llvm/Analysis/DataStructure/DataStructure.h
@@ -157,11 +157,12 @@ public:
     return ActualCallees;
   }
 
-  ActualCalleesTy::iterator callee_begin(Instruction *I) const {
+  typedef ActualCalleesTy::const_iterator callee_iterator;
+  callee_iterator callee_begin(Instruction *I) const {
     return ActualCallees.lower_bound(std::pair<Instruction*,Function*>(I, 0));
   }
 
-  ActualCalleesTy::iterator callee_end(Instruction *I) const {
+  callee_iterator callee_end(Instruction *I) const {
     I = (Instruction*)((char*)I + 1);
     return ActualCallees.lower_bound(std::pair<Instruction*,Function*>(I, 0));
   }

diff --git a/include/llvm/Analysis/DataStructure/EquivClassGraphs.h b/include/llvm/Analysis/DataStructure/EquivClassGraphs.h
index d97739acbf3cdfacb08f9bd42c9fe8056553aaa4..009e3ca87f0f5f31b9bfae9e8b8da54977359659 100644 (file)
--- a/include/llvm/Analysis/DataStructure/EquivClassGraphs.h
+++ b/include/llvm/Analysis/DataStructure/EquivClassGraphs.h
@@ -100,12 +100,13 @@ namespace llvm {
     const ActualCalleesTy &getActualCallees() const {
       return ActualCallees;
     }
-    
-    ActualCalleesTy::iterator callee_begin(Instruction *I) const {
+
+    typedef ActualCalleesTy::const_iterator callee_iterator;
+    callee_iterator callee_begin(Instruction *I) const {
       return ActualCallees.lower_bound(std::pair<Instruction*,Function*>(I, 0));
     }
     
-    ActualCalleesTy::iterator callee_end(Instruction *I) const {
+    callee_iterator callee_end(Instruction *I) const {
       I = (Instruction*)((char*)I + 1);
       return ActualCallees.lower_bound(std::pair<Instruction*,Function*>(I, 0));
     }