From f80fab5513d7cd6518a759a13c1fc4f6c53d5125 Mon Sep 17 00:00:00 2001 From: Brandon Talamini Date: Thu, 5 Dec 2024 15:08:41 -0800 Subject: [PATCH] Fix logical conflict not picked up by merge algorithm --- src/serac/numerics/functional/domain.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/serac/numerics/functional/domain.cpp b/src/serac/numerics/functional/domain.cpp index 9e1900c5d..c39bef78c 100644 --- a/src/serac/numerics/functional/domain.cpp +++ b/src/serac/numerics/functional/domain.cpp @@ -584,7 +584,7 @@ Domain set_operation(SET_OPERATION op, const Domain& a, const Domain& b) assert(a.dim_ == b.dim_); assert(a.type_ == b.type_); - Domain output{a.mesh_, a.dim_, a.type_}; + Domain combined{a.mesh_, a.dim_, a.type_}; using Ids = std::vector; auto apply_set_op = [&op](const Ids& x, const Ids& y) { return set_operation(op, x, y); };