Changeset 1340 for trunk/source/global/management/src/G4StateManager.cc

Timestamp:

Nov 5, 2010, 3:45:55 PM (14 years ago)

Author:

garnier

Message:

update ti head

File:

• trunk/source/global/management/src/G4StateManager.cc (modified) (4 diffs)

trunk/source/global/management/src/G4StateManager.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4StateManager.cc,v 1.13 2006/11/23 00:41:56 asaim Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4StateManager.cc,v 1.15 2010/10/01 16:36:31 gcosmo Exp $
+// GEANT4 tag $Name: global-V09-03-22 $
 //
 // 
@@ -61 +61 @@
     theDependentsList.pop_back();
     for (std::vector<G4VStateDependent*>::iterator
-         i=theDependentsList.begin(); i!=theDependentsList.end(); i++)
+         i=theDependentsList.begin(); i!=theDependentsList.end();)
     {
       if (*i==state)
       {
-        theDependentsList.erase(i);
-        i--;
+        i = theDependentsList.erase(i);
+      }
+      else
+      {
+        ++i;
       }
     } 
@@ -153 +156 @@
   G4VStateDependent* tmp = 0;
   for (std::vector<G4VStateDependent*>::iterator i=theDependentsList.begin();
-       i!=theDependentsList.end(); i++)
-    {
-      if (**i==*aDependent) 
-        {
-          tmp = *i;
-          theDependentsList.erase(i);
-        } 
-    }
+       i!=theDependentsList.end();)
+  {
+    if (**i==*aDependent) 
+    {
+      tmp = *i;
+      i = theDependentsList.erase(i);
+    }
+    else
+    {
+      ++i;
+    }
+  }
   return (tmp != 0);
 }
@@ -216 +223 @@
   G4VStateDependent* tmp = 0;
   for (std::vector<G4VStateDependent*>::iterator i=theDependentsList.begin();
-       i!=theDependentsList.end(); i++)
-    {
-      if (**i==*aDependent) 
-        {
-          tmp = *i;
-          theDependentsList.erase(i);
-        } 
-    }
+       i!=theDependentsList.end();)
+  {
+    if (**i==*aDependent) 
+    {
+      tmp = *i;
+      i = theDependentsList.erase(i);
+    }
+    else
+    {
+      ++i;
+    }
+  }
   return tmp;
 }