Changeset c83b98

Timestamp:

Jul 22, 2010, 11:23:28 AM (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:

23761b

Parents:

6e7147

Message:

Made the instantiation of Formula::iterator and Formula::const_iterator less ugly by refering to typedefs

File:

• src/Formula.cpp (modified) (1 diff)

src/Formula.cpp

@@ -361 +361 @@
 
 // instantiate Formula::iterator
-template Formula::_iterator<Formula::value_type>::_iterator(set_t&);
-template Formula::_iterator<Formula::value_type>::_iterator(set_t&,size_t);
-template Formula::_iterator<Formula::value_type>::_iterator(const Formula::_iterator<Formula::value_type>&);
-template Formula::_iterator<Formula::value_type>::~_iterator();
-template Formula::_iterator<Formula::value_type> &Formula::_iterator<Formula::value_type>::operator=(const _iterator &);
-template bool Formula::_iterator<Formula::value_type>::operator==(const _iterator&);
-template bool Formula::_iterator<Formula::value_type>::operator!=(const _iterator&);
-template Formula::_iterator<Formula::value_type> Formula::_iterator<Formula::value_type>::operator++();
-template Formula::_iterator<Formula::value_type> Formula::_iterator<Formula::value_type>::operator++(int);
-template Formula::_iterator<Formula::value_type> Formula::_iterator<Formula::value_type>::operator--();
-template Formula::_iterator<Formula::value_type> Formula::_iterator<Formula::value_type>::operator--(int);
-template Formula::value_type Formula::_iterator<Formula::value_type>::operator*();
-template Formula::value_type *Formula::_iterator<Formula::value_type>::operator->();
+template Formula::iterator::_iterator(set_t&);
+template Formula::iterator::_iterator(set_t&,size_t);
+template Formula::iterator::_iterator(const Formula::iterator&);
+template Formula::iterator::~_iterator();
+template Formula::iterator &Formula::iterator::operator=(const Formula::iterator&);
+template bool Formula::iterator::operator==(const Formula::iterator&);
+template bool Formula::iterator::operator!=(const Formula::iterator&);
+template Formula::iterator Formula::iterator::operator++();
+template Formula::iterator Formula::iterator::operator++(int);
+template Formula::iterator Formula::iterator::operator--();
+template Formula::iterator Formula::iterator::operator--(int);
+template Formula::value_type Formula::iterator::operator*();
+template Formula::value_type *Formula::iterator::operator->();
 
 // instantiate Formula::const_iterator
-template Formula::_iterator<const Formula::value_type>::_iterator(set_t&);
-template Formula::_iterator<const Formula::value_type>::_iterator(set_t&,size_t);
-template Formula::_iterator<const Formula::value_type>::_iterator(const Formula::_iterator<const Formula::value_type>&);
-template Formula::_iterator<const Formula::value_type>::~_iterator();
-template Formula::_iterator<const Formula::value_type> &Formula::_iterator<const Formula::value_type>::operator=(const _iterator &);
-template bool Formula::_iterator<const Formula::value_type>::operator==(const _iterator&);
-template bool Formula::_iterator<const Formula::value_type>::operator!=(const _iterator&);
-template Formula::_iterator<const Formula::value_type> Formula::_iterator<const Formula::value_type>::operator++();
-template Formula::_iterator<const Formula::value_type> Formula::_iterator<const Formula::value_type>::operator++(int);
-template Formula::_iterator<const Formula::value_type> Formula::_iterator<const Formula::value_type>::operator--();
-template Formula::_iterator<const Formula::value_type> Formula::_iterator<const Formula::value_type>::operator--(int);
-template const Formula::value_type Formula::_iterator<const Formula::value_type>::operator*();
-template const Formula::value_type *Formula::_iterator<const Formula::value_type>::operator->();
+template Formula::const_iterator::_iterator(set_t&);
+template Formula::const_iterator::_iterator(set_t&,size_t);
+template Formula::const_iterator::_iterator(const Formula::const_iterator&);
+template Formula::const_iterator::~_iterator();
+template Formula::const_iterator &Formula::const_iterator::operator=(const Formula::const_iterator&);
+template bool Formula::const_iterator::operator==(const Formula::const_iterator&);
+template bool Formula::const_iterator::operator!=(const Formula::const_iterator&);
+template Formula::const_iterator Formula::const_iterator::operator++();
+template Formula::Formula::const_iterator Formula::const_iterator::operator++(int);
+template Formula::Formula::const_iterator Formula::const_iterator::operator--();
+template Formula::Formula::const_iterator Formula::const_iterator::operator--(int);
+template const Formula::value_type Formula::const_iterator::operator*();
+template const Formula::value_type *Formula::const_iterator::operator->();
 
 /********************** I/O of Formulas ************************************************/