From 1bd8f6a0697d7703f9ee523c705821129a40a9d7 Mon Sep 17 00:00:00 2001 From: Maarten Hilferink Date: Tue, 12 Sep 2023 13:42:03 +0200 Subject: [PATCH] F2 supplemental --- clc/dll/include/OperAttrBin.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/clc/dll/include/OperAttrBin.h b/clc/dll/include/OperAttrBin.h index 89b29880d..6c176b776 100644 --- a/clc/dll/include/OperAttrBin.h +++ b/clc/dll/include/OperAttrBin.h @@ -131,18 +131,18 @@ struct BinaryAttrOper : AbstrBinaryAttrOper , [arg1, arg2, af](tile_id t) { return prepare_data{ arg1->GetFutureTile(af & AF1_ISPARAM ? 0 : t), arg2->GetFutureTile(af & AF2_ISPARAM ? 0 : t) }; } , [this, af MG_DEBUG_ALLOCATOR_SRC_PARAM](sequence_traits::seq_t resData, prepare_data futureData) { -// if (resultAdi->WasFailed(FR_Data)) -// resultAdi->ThrowFail(); -// try { + if (resultAdi->WasFailed(FR_Data)) + resultAdi->ThrowFail(); + try { auto futureTileA = throttled_async([&futureData] { return futureData.first->GetTile(); }); auto tileB = futureData.second->GetTile(); this->CalcTile(resData, futureTileA.get().get_view(), tileB.get_view(), af MG_DEBUG_ALLOCATOR_SRC_PARAM); -// } -// catch (...) -// { -// resultAdi->CatchFail(FailType::FR_Data); -// throw; -// } + } + catch (...) + { + resultAdi->CatchFail(FailType::FR_Data); + throw; + } } MG_DEBUG_ALLOCATOR_SRC_PARAM );