Changeset 1887bb for src/Actions

Timestamp:

Aug 27, 2012, 11:36:57 AM (13 years ago)

Author:

Michael Ankele <ankele@…>

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:

b2a7cc

Parents:

d0f3ba

git-author:

Michael Ankele <ankele@…> (08/10/12 12:34:13)

git-committer:

Michael Ankele <ankele@…> (08/27/12 11:36:57)

Message:

drop compatibility for old boost version (filesystem)

Location:

src/Actions

Files:

• AtomAction/SaveSelectedAtomsAction.cpp (modified) (1 diff)
• MoleculeAction/LoadAction.cpp (modified) (1 diff)
• MoleculeAction/SaveAdjacencyAction.cpp (modified) (1 diff)
• MoleculeAction/SaveBondsAction.cpp (modified) (1 diff)
• MoleculeAction/SaveSelectedMoleculesAction.cpp (modified) (1 diff)
• WorldAction/InputAction.cpp (modified) (1 diff)
• WorldAction/OutputAsAction.cpp (modified) (1 diff)

src/Actions/AtomAction/SaveSelectedAtomsAction.cpp

@@ -45 +45 @@
   if (params.filename.get().has_filename()) {
     // get suffix
-#if BOOST_VERSION >= 104600
       FilenameSuffix = params.filename.get().extension().string().substr(1); // remove the prefixed "."
       FilenamePrefix = params.filename.get().stem().string();
-#else
-      FilenameSuffix = params.filename.get().extension().substr(1); // remove the prefixed "."
-      FilenamePrefix = params.filename.get().stem();
-#endif
   } else {
     ELOG(1, "Output file does not have a suffix, cannot recognize format.");

src/Actions/MoleculeAction/LoadAction.cpp

@@ -55 +55 @@
     if (params.filename.get().has_filename()) {
       // get suffix
-#if BOOST_VERSION >= 104600
       FilenameSuffix = params.filename.get().extension().string().substr(1); // remove the prefixed "."
       FilenamePrefix = params.filename.get().stem().string();
-#else
-      FilenameSuffix = params.filename.get().extension().substr(1); // remove the prefixed "."
-      FilenamePrefix = params.filename.get().stem();
-#endif
     } else {
       ELOG(1, "Input file does not have a suffix, cannot recognize format.");

src/Actions/MoleculeAction/SaveAdjacencyAction.cpp

@@ -44 +44 @@
     LOG(0, "Storing adjacency to path " << params.adjacencyfile.get() << ".");
     // TODO: sollte stream nicht filename benutzen, besser fuer unit test
-#if BOOST_VERSION >= 104600
     mol->StoreAdjacencyToFile(params.adjacencyfile.get().leaf().string(), params.adjacencyfile.get().branch_path().string());
-#else
-    mol->StoreAdjacencyToFile(params.adjacencyfile.get().leaf(), params.adjacencyfile.get().branch_path().string());
-#endif
   }
   return Action::success;

src/Actions/MoleculeAction/SaveBondsAction.cpp

@@ -44 +44 @@
     LOG(0, "Storing bonds to path " << params.bondsfile.get() << ".");
     // TODO: sollte stream, nicht filenamen direkt nutzen, besser fuer unit tests
-#if BOOST_VERSION >= 104600
     mol->StoreBondsToFile(params.bondsfile.get().leaf().string(), params.bondsfile.get().branch_path().string());
-#else
-    mol->StoreBondsToFile(params.bondsfile.get().leaf(), params.bondsfile.get().branch_path().string());
-#endif
   }
   return Action::success;

src/Actions/MoleculeAction/SaveSelectedMoleculesAction.cpp

@@ -45 +45 @@
   if (params.filename.get().has_filename()) {
     // get suffix
-#if BOOST_VERSION >= 104600
       FilenameSuffix = params.filename.get().extension().string().substr(1); // remove the prefixed "."
       FilenamePrefix = params.filename.get().stem().string();
-#else
-      FilenameSuffix = params.filename.get().extension().substr(1); // remove the prefixed "."
-      FilenamePrefix = params.filename.get().stem();
-#endif
   } else {
     ELOG(1, "Output file does not have a suffix, cannot recognize format.");

src/Actions/WorldAction/InputAction.cpp

@@ -52 +52 @@
   if (params.filename.get().has_filename()) {
     // get suffix
-#if BOOST_VERSION >= 104600
     FilenameSuffix = params.filename.get().extension().string().substr(1); // remove the prefixed "."
     FilenamePrefix = params.filename.get().stem().string();
-#else
-    FilenameSuffix = params.filename.get().extension().substr(1); // remove the prefixed "."
-    FilenamePrefix = params.filename.get().stem();
-#endif
     LOG(1, "Setting config file name prefix to " << FilenamePrefix << ".");
     parsers.SetOutputPrefixForAll(FilenamePrefix);

src/Actions/WorldAction/OutputAsAction.cpp

@@ -46 +46 @@
   if (params.filename.get().has_filename()) {
     // get suffix
-#if BOOST_VERSION >= 104600
     FilenameSuffix = params.filename.get().extension().string().substr(1); // remove the prefixed "."
     FilenamePrefix = params.filename.get().stem().string();
-#else
-    FilenameSuffix = params.filename.get().extension().substr(1); // remove the prefixed "."
-    FilenamePrefix = params.filename.get().stem();
-#endif
   } else {
     ELOG(1, "Output file does not have a suffix, cannot recognize format.");