Changeset 632a52 for src/Actions

Timestamp:

Sep 28, 2011, 12:48:59 PM (13 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:

ec188c

Parents:

e5c233

git-author:

Frederik Heber <heber@…> (08/09/11 16:59:24)

git-committer:

Frederik Heber <heber@…> (09/28/11 12:48:59)

Message:

FIX: boost::filesystem 1.47 changed output of extension(), stem(), and leaf().

• fix was to add .string().
• we check for BOOST_VERSION to be greater equal than 104600 to apply this fix.

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/OutputAction.cpp (modified) (1 diff)

src/Actions/AtomAction/SaveSelectedAtomsAction.cpp

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

src/Actions/MoleculeAction/LoadAction.cpp

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

src/Actions/MoleculeAction/SaveAdjacencyAction.cpp

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

src/Actions/MoleculeAction/SaveBondsAction.cpp

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

src/Actions/MoleculeAction/SaveSelectedMoleculesAction.cpp

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

src/Actions/WorldAction/InputAction.cpp

@@ -53 +53 @@
   if (params.filename.has_filename()) {
     // get suffix
+#if BOOST_VERSION >= 104600
+    FilenameSuffix = params.filename.extension().string().substr(1); // remove the prefixed "."
+    FilenamePrefix = params.filename.stem().string();
+#else
     FilenameSuffix = params.filename.extension().substr(1); // remove the prefixed "."
     FilenamePrefix = params.filename.stem();
+#endif
     DoLog(1) && (Log() << Verbose(1) << "Setting config file name prefix to " << FilenamePrefix << "." << endl);
     FormatParserStorage::getInstance().SetOutputPrefixForAll(FilenamePrefix);

src/Actions/WorldAction/OutputAction.cpp

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