Changeset ed58ad

Timestamp:

Mar 11, 2010, 2:29:04 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:

0f6f3a, cd032d

Parents:

aee1a3

Message:

Made the errorLogger use the new Singleton framework

Location:

src

Files:

• errorlogger.cpp (modified) (3 diffs)
• errorlogger.hpp (modified) (2 diffs)
• log.cpp (modified) (2 diffs)

src/errorlogger.cpp

@@ -9 +9 @@
 #include "errorlogger.hpp"
 #include "verbose.hpp"
+#include "Patterns/Singleton_impl.hpp"
 
 ofstream null("/dev/null");
-
-errorLogger* errorLogger::instance = NULL;
 int errorLogger::verbosity = 2;
 ostream* errorLogger::nix = &null;
@@ -23 +22 @@
 errorLogger::errorLogger()
 {
-  instance = NULL;
   verbosity = 2;
 };
@@ -34 +32 @@
 }
 
-/**
- * Returns the singleton errorLogger instance.
- *
- * \return errorLogger instance
- */
-errorLogger* errorLogger::getInstance() {
-  if (instance == NULL) {
-    instance = new errorLogger();
-  }
-
-  return instance;
-}
-
-
-/**
- * Purges the current errorLogger instance.
- */
-void errorLogger::purgeInstance() {
-  if (instance != NULL) {
-    delete instance;
-  }
-
-  instance = NULL;
-}
+CONSTRUCT_SINGLETON(errorLogger)
 
 /**

src/errorlogger.hpp

@@ -11 +11 @@
 #include <iostream>
 
+#include "Patterns/Singleton.hpp"
+
 using namespace std;
 
 class Verbose;
 
-class errorLogger {
+class errorLogger : public Singleton<errorLogger>{
+  friend class Singleton<errorLogger>;
 public :
   static ostream *nix;
   static int verbosity;
 
-  static errorLogger* getInstance();
-  static void purgeInstance();
   static bool DoOutput();
   static void setVerbosity(int verbosityLevel);
@@ -31 +32 @@
   ~errorLogger();
 
-private:
-  static errorLogger* instance;
 };
 

src/log.cpp

@@ -16 +16 @@
 void setVerbosity(int verbosityLevel) {
   logger::getInstance().setVerbosity(verbosityLevel);
-  errorLogger::getInstance()->setVerbosity(verbosityLevel);
+  errorLogger::getInstance().setVerbosity(verbosityLevel);
 }
 
@@ -33 +33 @@
  * \param indentation level of the message to log
  */
-class errorLogger * eLog() {
+class errorLogger & eLog() {
   return errorLogger::getInstance();
 }