Renamed typedef "iterator" in ValueState to "vb_iterator" (for "VariableBindings").

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

diff --git a/Analysis/GRConstants.cpp b/Analysis/GRConstants.cpp
index 6a1c771b22c3190d41b3a563ae52a0bd9d125c6e..a156cdb261ee9777cb3c7d366d3af0afc2e86e17 100644 (file)
--- a/Analysis/GRConstants.cpp
+++ b/Analysis/GRConstants.cpp
@@ -290,7 +290,7 @@ void GRConstants::ProcessBranch(Expr* Condition, Stmt* Term,
   StateTy PrevState = builder.getState();
   
   // Remove old bindings for subexpressions.  
-  for (StateTy::iterator I=PrevState.begin(), E=PrevState.end(); I!=E; ++I)
+  for (StateTy::vb_iterator I=PrevState.begin(), E=PrevState.end(); I!=E; ++I)
     if (I.getKey().isSubExpr())
       PrevState = StateMgr.Remove(PrevState, I.getKey());
   
@@ -453,7 +453,7 @@ void GRConstants::ProcessStmt(Stmt* S, StmtNodeBuilder& builder) {
 GRConstants::StateTy GRConstants::RemoveDeadBindings(Stmt* Loc, StateTy M) {
   // Note: in the code below, we can assign a new map to M since the
   //  iterators are iterating over the tree of the *original* map.
-  StateTy::iterator I = M.begin(), E = M.end();
+  StateTy::vb_iterator I = M.begin(), E = M.end();
 
 
   for (; I!=E && !I.getKey().isSymbol(); ++I) {
@@ -887,7 +887,7 @@ struct VISIBILITY_HIDDEN DOTGraphTraits<GRConstants::NodeTy*> :
                         VarBindKey::Kind kind, bool isFirstGroup = false) {
     bool isFirst = true;
     
-    for (GRConstants::StateTy::iterator I=M.begin(), E=M.end();I!=E;++I) {        
+    for (GRConstants::StateTy::vb_iterator I=M.begin(), E=M.end();I!=E;++I) {        
       if (I.getKey().getKind() != kind)
         continue;
     

diff --git a/Analysis/ValueState.h b/Analysis/ValueState.h
index 2c685c015795f086aed72faa0cc397120efa54cd..bd2bc7033959114618b556b2c3cda7062c118a24 100644 (file)
--- a/Analysis/ValueState.h
+++ b/Analysis/ValueState.h
@@ -151,10 +151,10 @@ public:
   // Iterators.
   
   typedef vstate::VariableBindingsTy VariableBindingsTy;
-  typedef VariableBindingsTy::iterator iterator;
+  typedef VariableBindingsTy::iterator vb_iterator;
   
-  iterator begin() { return Data->VariableBindings.begin(); }
-  iterator end() { return Data->VariableBindings.end(); }
+  vb_iterator begin() { return Data->VariableBindings.begin(); }
+  vb_iterator end() { return Data->VariableBindings.end(); }
   
   // Profiling and equality testing.