[Minotaur-dev] [minotaur-solver/minotaur] 793750: fixing compilation

Ashutosh Mahajan noreply at github.com
Mon Jul 1 21:06:47 CDT 2019


  Branch: refs/heads/master
  Home:   https://github.com/minotaur-solver/minotaur
  Commit: 7937504cb16f08edc904723c48a8abcb2105a47c
      https://github.com/minotaur-solver/minotaur/commit/7937504cb16f08edc904723c48a8abcb2105a47c
  Author: Ashutosh Mahajan <amahajan at iitb.ac.in>
  Date:   2019-07-02 (Tue, 02 Jul 2019)

  Changed paths:
    M src/base/NlPresHandler.cpp
    M src/base/NlPresHandler.h
    M src/base/ReliabilityBrancher.cpp

  Log Message:
  -----------
  fixing compilation


  Commit: 8d4801bea63f5121b73cdcc778183518e756c489
      https://github.com/minotaur-solver/minotaur/commit/8d4801bea63f5121b73cdcc778183518e756c489
  Author: Ashutosh Mahajan <amahajan at iitb.ac.in>
  Date:   2019-07-02 (Tue, 02 Jul 2019)

  Changed paths:
    M src/algorithms/McBnb.cpp
    M src/base/ParBranchAndBound.cpp
    M src/base/ParBranchAndBound.h
    M src/base/ParPCBProcessor.cpp
    M src/base/ParPCBProcessor.h
    M src/base/ParTreeManager.h
    M src/base/QGHandler.cpp
    M src/base/QGHandler.h
    M src/engines/Cplex/CplexLPEngine.cpp
    M src/engines/Cplex/CplexMILPEngine.cpp

  Log Message:
  -----------
  Merge branch 'master' of github:minotaur-solver/minotaur


  Commit: 9e48559e450207509de0e16a34cb476ff9e24f23
      https://github.com/minotaur-solver/minotaur/commit/9e48559e450207509de0e16a34cb476ff9e24f23
  Author: Ashutosh Mahajan <amahajan at iitb.ac.in>
  Date:   2019-07-02 (Tue, 02 Jul 2019)

  Changed paths:
    M src/base/ParBranchAndBound.cpp

  Log Message:
  -----------
  guarding openmp with #if


Compare: https://github.com/minotaur-solver/minotaur/compare/5a187dfd2837...9e48559e4502


More information about the Minotaur-dev mailing list