From b55d393f90549cc6aac04738095a45024708c872 Mon Sep 17 00:00:00 2001 From: Laurent Perron Date: Wed, 9 Oct 2024 16:40:51 +0200 Subject: [PATCH] fix test for windows --- ortools/sat/work_assignment_test.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ortools/sat/work_assignment_test.cc b/ortools/sat/work_assignment_test.cc index 83de91dc08..8e3d785a21 100644 --- a/ortools/sat/work_assignment_test.cc +++ b/ortools/sat/work_assignment_test.cc @@ -146,9 +146,9 @@ class SharedTreeSolveTest : public testing::TestWithParam { params.set_num_workers(4); params.set_shared_tree_num_workers(4); params.set_cp_model_presolve(false); - params.MergeFrom(SatParameters{ - google::protobuf::contrib::parse_proto::ParseTextProtoOrDie( - GetParam())}); + const SatParameters to_merge = + google::protobuf::contrib::parse_proto::ParseTextProtoOrDie(GetParam()); + params.MergeFrom(to_merge); return params; } };