From c432e73af0bef21dd8d830898ce0925da9915b18 Mon Sep 17 00:00:00 2001 From: "Kartik K. Agaram" Date: Sun, 13 Mar 2016 17:33:01 -0700 Subject: 2769 - fix build_and_test_until 043space.cc --- 033exclusive_container.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to '033exclusive_container.cc') diff --git a/033exclusive_container.cc b/033exclusive_container.cc index cc1922c2..18c07f3a 100644 --- a/033exclusive_container.cc +++ b/033exclusive_container.cc @@ -341,14 +341,14 @@ def main [ //: Since the different variants of an exclusive-container might have //: different sizes, relax the size mismatch check for 'merge' instructions. :(before "End size_mismatch(x) Cases") -if (current_instruction().operation == MERGE +if (current_step_index() < SIZE(Current_routine->steps()) + && current_instruction().operation == MERGE && !current_instruction().products.empty() && current_instruction().products.at(0).type) { reagent x = current_instruction().products.at(0); canonize(x); - if (get(Type, x.type->value).kind == EXCLUSIVE_CONTAINER) { + if (get(Type, x.type->value).kind == EXCLUSIVE_CONTAINER) return size_of(x) < SIZE(data); - } } :(scenario merge_exclusive_container_with_mismatched_sizes) -- cgit 1.4.1-2-gfad0