Changeset d223d5 for src/Helpers

Timestamp:

Aug 6, 2010, 9:34:59 AM (15 years ago)

Author:

Frederik Heber <heber@…>

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:

311d688

Parents:

b6da28 (diff), 255971 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Frederik Heber <heber@…> (08/06/10 09:24:26)

git-committer:

Frederik Heber <heber@…> (08/06/10 09:34:59)

Message:

Merge branch 'SharedLibraries' into stable

• BUGFIX: MemDebug.cpp in case of no MEMDEBUG defined, iosfwd include was missing.

Conflicts:

src/Actions/AnalysisAction/PointCorrelationAction.hpp
src/Actions/Makefile.am
src/Makefile.am
src/UIElements/Makefile.am
src/unittests/Makefile.am
src/unittests/ShapeUnittest.cpp

• Mostly took over stuff from branch SharedLibraries as ..LIBS statments in Makefile.ams changed.
• target unity always put at very end, added also to Exceptions, LinearAlgebra, Parser
• ShapeUnittest lacked changes of files moved to LinearAlgebra

Location:

src/Helpers

Files:

• Info.cpp (moved) (moved from src/info.cpp ) (1 diff)
• Info.hpp (moved) (moved from src/info.hpp )
• Log.cpp (moved) (moved from src/log.cpp ) (1 diff)
• Log.hpp (moved) (moved from src/log.hpp ) (1 diff)
• Makefile.am (added)
• MemDebug.hpp (modified) (1 diff)
• Verbose.cpp (moved) (moved from src/verbose.cpp ) (1 diff)
• Verbose.hpp (moved) (moved from src/verbose.hpp )
• errorlogger.cpp (moved) (moved from src/errorlogger.cpp ) (1 diff)
• errorlogger.hpp (moved) (moved from src/errorlogger.hpp )
• helpers.cpp (moved) (moved from src/helpers.cpp ) (1 diff)
• helpers.hpp (moved) (moved from src/helpers.hpp ) (1 diff)
• logger.cpp (moved) (moved from src/logger.cpp ) (1 diff)
• logger.hpp (moved) (moved from src/logger.hpp )

src/Helpers/Info.cpp

@@ -8 +8 @@
 #include "Helpers/MemDebug.hpp"
 
-#include "info.hpp"
-#include "log.hpp"
-#include "verbose.hpp"
+#include "Helpers/Info.hpp"
+#include "Helpers/Log.hpp"
+#include "Helpers/Verbose.hpp"
 
 int Info::verbosity = 0;

src/Helpers/Log.cpp

@@ -8 +8 @@
 #include "Helpers/MemDebug.hpp"
 
-#include "logger.hpp"
-#include "errorlogger.hpp"
+#include "Helpers/logger.hpp"
+#include "Helpers/errorlogger.hpp"
 
 /**

src/Helpers/Log.hpp

@@ -9 +9 @@
 #define LOG_HPP_
 
-#include "errorlogger.hpp"
-#include "logger.hpp"
+#include "Helpers/errorlogger.hpp"
+#include "Helpers/logger.hpp"
 
 class logger & Log();

src/Helpers/MemDebug.hpp

@@ -101 +101 @@
 
 #else
+
+#include <iosfwd>
+
 // memory debugging was disabled
 
 namespace Memory {
-  inline void getState(){}
+  inline void getState(){};
 
   inline void dumpMemory(std::ostream&){};

src/Helpers/Verbose.cpp

@@ -3 +3 @@
 #include "Helpers/MemDebug.hpp"
 
-#include "info.hpp"
-#include "verbose.hpp"
+#include "Helpers/Info.hpp"
+#include "Helpers/Verbose.hpp"
 #include <iostream>
 

src/Helpers/errorlogger.cpp

@@ -10 +10 @@
 #include <fstream>
 #include <iostream>
-#include "errorlogger.hpp"
-#include "verbose.hpp"
+#include "Helpers/errorlogger.hpp"
+#include "Helpers/Verbose.hpp"
 #include "Patterns/Singleton_impl.hpp"
 

src/Helpers/helpers.cpp

@@ -6 +6 @@
 #include "Helpers/MemDebug.hpp"
 
-#include "helpers.hpp"
+#include "Helpers/helpers.hpp"
 #include "Helpers/fast_functions.hpp"
-#include "verbose.hpp"
-#include "log.hpp"
+#include "Helpers/Verbose.hpp"
+#include "Helpers/Log.hpp"
 
 #include <iostream>

src/Helpers/helpers.hpp

@@ -19 +19 @@
 
 #include "defs.hpp"
-#include "log.hpp"
+#include "Helpers/Log.hpp"
 
 /********************************************** definitions *********************************/

src/Helpers/logger.cpp

@@ -10 +10 @@
 #include <fstream>
 #include <iostream>
-#include "logger.hpp"
-#include "verbose.hpp"
+#include "Helpers/logger.hpp"
+#include "Helpers/Verbose.hpp"
 #include "Patterns/Singleton_impl.hpp"