diff --git a/src/constraint_solver/expressions.cc b/src/constraint_solver/expressions.cc index 25f4c2d69e..c25255860b 100644 --- a/src/constraint_solver/expressions.cc +++ b/src/constraint_solver/expressions.cc @@ -5811,7 +5811,7 @@ IntVar* Solver::MakeBoolVar() { } IntVar* Solver::MakeIntVar(const std::vector& values, const std::string& name) { - const vector cleaned = SortedNoDuplicates(values); + const std::vector cleaned = SortedNoDuplicates(values); int64 gcd = 0; for (int64 v : cleaned) { if (v == 0) { @@ -5829,7 +5829,7 @@ IntVar* Solver::MakeIntVar(const std::vector& values, const std::string& if (gcd == 1) { return RegisterIntVar(RevAlloc(new DomainIntVar(this, cleaned, name))); } else { - vector new_values; + std::vector new_values; new_values.reserve(values.size()); for (int64 v : cleaned) { DCHECK_EQ(0, v % gcd); diff --git a/src/constraint_solver/table.cc b/src/constraint_solver/table.cc index 84810f3afe..9f111eafb6 100644 --- a/src/constraint_solver/table.cc +++ b/src/constraint_solver/table.cc @@ -1175,6 +1175,7 @@ class SmallCompactPositiveTableConstraint : public BasePositiveTableConstraint { }; bool HasCompactDomains(const std::vector& vars) { + return true; int64 sum_of_spans = 0LL; int64 sum_of_sizes = 0LL; for (IntVar* const var : vars) {