lars/geant4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Import Geant4 9.4.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-06-09 16:25:56 +02:00
parent 74cad5e589
commit 89a9605df1
4440 changed files with 379508 additions and 189225 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/global/management/src/G4StateManager.cc
+28 -17
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4StateManager.cc,v 1.13 2006/11/23 00:41:56 asaim Exp $
// GEANT4 tag $Name: geant4-09-02 $
// $Id: G4StateManager.cc,v 1.15 2010/10/01 16:36:31 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-04 $
//
//
// ------------------------------------------------------------
@@ -60,12 +60,15 @@ G4StateManager::~G4StateManager()
state = theDependentsList.back();
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;
}
}
if ( state ) { delete state; }
@@ -152,14 +155,18 @@ G4StateManager::DeregisterDependent(G4VStateDependent* aDependent)
{
G4VStateDependent* tmp = 0;
for (std::vector<G4VStateDependent*>::iterator i=theDependentsList.begin();
i!=theDependentsList.end(); i++)
i!=theDependentsList.end();)
{
if (**i==*aDependent)
{
if (**i==*aDependent)
{
tmp = *i;
theDependentsList.erase(i);
}
tmp = *i;
i = theDependentsList.erase(i);
}
else
{
++i;
}
}
return (tmp != 0);
}
@@ -215,14 +222,18 @@ G4StateManager::RemoveDependent(const G4VStateDependent* aDependent)
{
G4VStateDependent* tmp = 0;
for (std::vector<G4VStateDependent*>::iterator i=theDependentsList.begin();
i!=theDependentsList.end(); i++)
i!=theDependentsList.end();)
{
if (**i==*aDependent)
{
if (**i==*aDependent)
{
tmp = *i;
theDependentsList.erase(i);
}
tmp = *i;
i = theDependentsList.erase(i);
}
else
{
++i;
}
}
return tmp;
}