Fixing compilation issue on VS2013 in CP solver.
This commit is contained in:
@@ -1465,7 +1465,7 @@ class Solver {
|
||||
// Creates a demon from a callback.
|
||||
Demon* MakeCallbackDemon(std::function<void(Solver*)> callback);
|
||||
// Creates a demon from a closure.
|
||||
Demon* MakeCallbackDemon(std::function<void()> closure);
|
||||
Demon* MakeClosureDemon(std::function<void()> closure);
|
||||
|
||||
// (l <= b <= u)
|
||||
Constraint* MakeBetweenCt(IntExpr* const v, int64 l, int64 u);
|
||||
|
||||
@@ -436,8 +436,8 @@ Demon* Solver::MakeCallbackDemon(std::function<void(Solver*)> callback) {
|
||||
return RevAlloc(new Callback1Demon(callback));
|
||||
}
|
||||
|
||||
Demon* Solver::MakeCallbackDemon(std::function<void()> callback) {
|
||||
return RevAlloc(new ClosureDemon(callback));
|
||||
Demon* Solver::MakeClosureDemon(std::function<void()> closure) {
|
||||
return RevAlloc(new ClosureDemon(closure));
|
||||
}
|
||||
|
||||
Constraint* Solver::MakeTrueConstraint() {
|
||||
|
||||
@@ -77,7 +77,7 @@ class IntervalVarStartAdapter : public DependencyGraphNode {
|
||||
: DependencyGraphNode(graph), interval_var_(var) {
|
||||
CHECK(graph != nullptr);
|
||||
CHECK(var != nullptr);
|
||||
Demon* const demon = interval_var_->solver()->MakeCallbackDemon(
|
||||
Demon* const demon = interval_var_->solver()->MakeClosureDemon(
|
||||
[this]() { WhenIntervalChanged(); });
|
||||
interval_var_->WhenAnything(demon);
|
||||
}
|
||||
|
||||
@@ -1255,6 +1255,7 @@ namespace operations_research {
|
||||
// - MakeBoolVarArray()
|
||||
//
|
||||
// - MakeCallbackDemon()
|
||||
// - MakeClosureDemon()
|
||||
//
|
||||
// - MakeFixedDurationIntervalVarArray()
|
||||
// - MakeIntervalVarArray()
|
||||
|
||||
Reference in New Issue
Block a user