Changeset cf1a07

Timestamp:

Feb 25, 2010, 4:56:16 PM (15 years ago)

Author:

Tillmann Crueger <crueger@…>

Branches:

Action_Thermostats, Add_AtomRandomPerturbation, Add_FitFragmentPartialChargesAction, Add_RotateAroundBondAction, Add_SelectAtomByNameAction, Added_ParseSaveFragmentResults, AddingActions_SaveParseParticleParameters, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_ParticleName_to_Atom, Adding_StructOpt_integration_tests, AtomFragments, Automaking_mpqc_open, AutomationFragmentation_failures, Candidate_v1.5.4, Candidate_v1.6.0, Candidate_v1.6.1, ChangeBugEmailaddress, ChangingTestPorts, ChemicalSpaceEvaluator, CombiningParticlePotentialParsing, Combining_Subpackages, Debian_Package_split, Debian_package_split_molecuildergui_only, Disabling_MemDebug, Docu_Python_wait, EmpiricalPotential_contain_HomologyGraph, EmpiricalPotential_contain_HomologyGraph_documentation, Enable_parallel_make_install, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, FitPartialCharges_GlobalError, Fix_BoundInBox_CenterInBox_MoleculeActions, Fix_ChargeSampling_PBC, Fix_ChronosMutex, Fix_FitPartialCharges, Fix_FitPotential_needs_atomicnumbers, Fix_ForceAnnealing, Fix_IndependentFragmentGrids, Fix_ParseParticles, Fix_ParseParticles_split_forward_backward_Actions, Fix_PopActions, Fix_QtFragmentList_sorted_selection, Fix_Restrictedkeyset_FragmentMolecule, Fix_StatusMsg, Fix_StepWorldTime_single_argument, Fix_Verbose_Codepatterns, Fix_fitting_potentials, Fixes, ForceAnnealing_goodresults, ForceAnnealing_oldresults, ForceAnnealing_tocheck, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, FragmentAction_writes_AtomFragments, FragmentMolecule_checks_bonddegrees, GeometryObjects, Gui_Fixes, Gui_displays_atomic_force_velocity, ImplicitCharges, IndependentFragmentGrids, IndependentFragmentGrids_IndividualZeroInstances, IndependentFragmentGrids_IntegrationTest, IndependentFragmentGrids_Sole_NN_Calculation, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, JobMarket_unresolvable_hostname_fix, MoreRobust_FragmentAutomation, ODR_violation_mpqc_open, PartialCharges_OrthogonalSummation, PdbParser_setsAtomName, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, Rewrite_FitPartialCharges, RotateToPrincipalAxisSystem_UndoRedo, SaturateAtoms_findBestMatching, SaturateAtoms_singleDegree, StoppableMakroAction, Subpackage_CodePatterns, Subpackage_JobMarket, Subpackage_LinearAlgebra, Subpackage_levmar, Subpackage_mpqc_open, Subpackage_vmg, Switchable_LogView, ThirdParty_MPQC_rebuilt_buildsystem, TrajectoryDependenant_MaxOrder, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, TremoloParser_setsAtomName, Ubuntu_1604_changes, stable

Children:

7042f45

Parents:

cbc5fb

Message:

FIX: repaired some access violation of STL-iterators in Observer and ActionRegistry

Location:

src

Files:

• Actions/ActionRegistry.cpp (modified) (1 diff)
• Patterns/Observer.cpp (modified) (4 diffs)

src/Actions/ActionRegistry.cpp

@@ -24 +24 @@
 {
   map<const string,Action*>::iterator iter;
-  for(iter=actionMap.begin();iter!=actionMap.end();iter++) {
+  for(iter=actionMap.begin();iter!=actionMap.end();++iter) {
     delete iter->second;
-    actionMap.erase(iter);
   }
+  actionMap.clear();
 }
 

src/Patterns/Observer.cpp

@@ -79 +79 @@
     callees_t *callees = callTable[this];
     callees_t::iterator iter;
-    for(iter=callees->begin();iter!=callees->end();iter++){
+    for(iter=callees->begin();iter!=callees->end();++iter){
       (*iter).second->update(this);
     }
@@ -123 +123 @@
 
   callees_t::iterator iter;
-  for(iter=callees->begin();iter!=callees->end();iter++){
+  for(iter=callees->begin();iter!=callees->end();++iter){
     res |= ((*iter).second == target);
   }
@@ -134 +134 @@
   callees_t *callees = callTable[this];
   callees_t::iterator iter;
-  for(iter=callees->begin();iter!=callees->end();iter++) {
-    if((*iter).second == target)
-      callees->erase(iter);
+  for(iter=callees->begin();iter!=callees->end();) {
+    if((*iter).second == target) {
+      callees->erase(iter++);
+    }
+    else {
+      ++iter;
+    }
   }
   if(callees->empty()){
@@ -158 +162 @@
     callees_t *callees = callTable[this];
     callees_t::iterator iter;
-    for(iter=callees->begin();iter!=callees->end();iter++){
+    for(iter=callees->begin();iter!=callees->end();++iter){
       (*iter).second->subjectKilled(this);
     }