[cfe-commits] r46755 - in /cfe/trunk/Analysis: GRConstants.cpp ValueState.h

[Ted Kremenek]

Author: kremenek
Date: Tue Feb  5 12:19:15 2008
New Revision: 46755

URL: http://llvm.org/viewvc/llvm-project?rev=46755&view=rev
Log:
Renamed typedef "iterator" in ValueState to "vb_iterator" (for "VariableBindings").

Modified:
    cfe/trunk/Analysis/GRConstants.cpp
    cfe/trunk/Analysis/ValueState.h

Modified: cfe/trunk/Analysis/GRConstants.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/Analysis/GRConstants.cpp?rev=46755&r1=46754&r2=46755&view=diff

==============================================================================
--- cfe/trunk/Analysis/GRConstants.cpp (original)
+++ cfe/trunk/Analysis/GRConstants.cpp Tue Feb  5 12:19:15 2008
@@ -290,7 +290,7 @@
   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 @@
 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 @@
                         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;
     

Modified: cfe/trunk/Analysis/ValueState.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/Analysis/ValueState.h?rev=46755&r1=46754&r2=46755&view=diff

==============================================================================
--- cfe/trunk/Analysis/ValueState.h (original)
+++ cfe/trunk/Analysis/ValueState.h Tue Feb  5 12:19:15 2008
@@ -151,10 +151,10 @@
   // 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.