Changeset dde50d for ThirdParty/JobMarket

Timestamp:

May 5, 2017, 2:17:23 PM (8 years ago)

Author:

Frederik Heber <frederik.heber@…>

Branches:

Action_Thermostats, Add_AtomRandomPerturbation, Add_RotateAroundBondAction, Add_SelectAtomByNameAction, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_StructOpt_integration_tests, AutomationFragmentation_failures, Candidate_v1.6.1, ChangeBugEmailaddress, ChangingTestPorts, ChemicalSpaceEvaluator, Docu_Python_wait, EmpiricalPotential_contain_HomologyGraph_documentation, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, Fix_ChronosMutex, Fix_StatusMsg, Fix_StepWorldTime_single_argument, Fix_Verbose_Codepatterns, ForceAnnealing_goodresults, ForceAnnealing_oldresults, ForceAnnealing_tocheck, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, GeometryObjects, Gui_displays_atomic_force_velocity, IndependentFragmentGrids_IntegrationTest, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, RotateToPrincipalAxisSystem_UndoRedo, StoppableMakroAction, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, Ubuntu_1604_changes

Children:

184d89

Parents:

33a694

git-author:

Frederik Heber <heber@…> (04/05/17 17:18:59)

git-committer:

Frederik Heber <frederik.heber@…> (05/05/17 14:17:23)

Message:

FIX: boost::serialization 1.58 introduced changes which breaks stand-alone compilation for a few headers.

• there we had to add boost/serialization/serialization.hpp prior to any other serialization header.

File:

• ThirdParty/JobMarket/src/JobMarket/Results/FragmentResult.hpp (modified) (2 diffs)

ThirdParty/JobMarket/src/JobMarket/Results/FragmentResult.hpp

@@ -16 +16 @@
 
 #include <string>
+#include <vector>
 
 #include <boost/shared_ptr.hpp>
@@ -60 +61 @@
 private:
   friend class boost::serialization::access;
+  // this is new since boost 1.58 when deserializing vector<FragmentResult>
+  friend class std::vector<FragmentResult, std::allocator<FragmentResult> >;
 
   /// private default constructor for serialization only.