Changeset 0b738b for src/poolworker.cpp

Timestamp:

Mar 15, 2017, 8:45:32 AM (8 years ago)

Author:

Frederik Heber <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.0, Candidate_v1.6.1, ChangeBugEmailaddress, ChangingTestPorts, ChemicalSpaceEvaluator, Disabling_MemDebug, Docu_Python_wait, EmpiricalPotential_contain_HomologyGraph_documentation, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, FitPartialCharges_GlobalError, 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, PartialCharges_OrthogonalSummation, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, RotateToPrincipalAxisSystem_UndoRedo, StoppableMakroAction, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, Ubuntu_1604_changes, stable

Children:

de51d2

Parents:

854a1e

git-author:

Frederik Heber <heber@…> (03/14/17 11:22:06)

git-committer:

Frederik Heber <heber@…> (03/15/17 08:45:32)

Message:

ENABLEFIX: Fixes to vmg and jobmarket enables.

• COND_COMPILE_JOBMARKET inside AS_IF by accident.
• ..._bindings in poolworker did not use conditional.

File:

• src/poolworker.cpp (modified) (1 diff)

src/poolworker.cpp

@@ -48 +48 @@
 // note we bind here to sort-of mock objects which are bases on SystemCommandJob
 #include "Jobs/MPQCCommandJob_binding.hpp"
+#ifdef HAVE_JOBMARKET
 #include "Jobs/MPQCJob_binding.hpp"
+#ifdef HAVE_VMG
 #include "Jobs/VMGJob_binding.hpp"
+#endif /* HAVE_VMG */
+#endif /* HAVE_JOBMARKET */
 
 int main(int argc, char* argv[])