changing setup_method_ signature

Author: HugoKulesza

ortools/linear_solver/linear_solver.cc

@@ -359,7 +359,7 @@ void MPSolver::SetSolveParameters(const std::string& parameter)
   resolution_parameter_ = parameter;
 } 
 
-void MPSolver::AddSetupMethod(std::function<void(void)> method)
+void MPSolver::AddSetupMethod(std::function<void(void*)> method)
 {
   setup_method_ = method;
 }

ortools/linear_solver/linear_solver.h

@@ -655,7 +655,7 @@ class MPSolver {
 
   void SetSolveParameters(const std::string& parameter);
 
-  void AddSetupMethod(std::function<void(void)>);
+  void AddSetupMethod(std::function<void(void*)>);
 
   /**
    * Sets a hint for solution.
@@ -924,7 +924,7 @@ class MPSolver {
 
   std::string resolution_parameter_;
 
-  std::function<void(void)> setup_method_;
+  std::function<void(void*)> setup_method_;
 
   static absl::Mutex global_count_mutex_;
 #ifndef SWIG

ortools/linear_solver/xpress_interface.cc

@@ -30,6 +30,8 @@ extern "C" {
 #include "xprs.h"
 }
 
+#include <cassert>
+
 #define XPRS_INTEGER 'I'
 #define XPRS_CONTINUOUS 'C'
 #define STRINGIFY2(X) #X
@@ -1659,7 +1661,7 @@ MPSolver::ResultStatus XpressInterface::Solve(MPSolverParameters const& param) {
     CHECK_STATUS(XPRSsetintcontrol(mLp, XPRS_MAXTIME, -1 * solver_->time_limit_in_secs()));
   }
   if (solver_->setup_method_ != nullptr)
-    solver_->setup_method_();
+    solver_->setup_method_(solver_->underlying_solver());
 
   // Solve.
   // Do not CHECK_STATUS here since some errors (for example CPXERR_NO_MEMORY)