From caa74d6b8d08a259e426b157a8fb52067f91b26f Mon Sep 17 00:00:00 2001 From: "Eunki, Hong" Date: Tue, 26 Nov 2024 14:16:56 +0900 Subject: [PATCH] Fix mis-implementation for try_catch macro try_catch macro used void(void) API internally. So the value inside of lambda function didnt return value correctly. Change-Id: I0bacdbe176fb6ea218b793e12637ca9c49d3e647 Signed-off-by: Eunki, Hong --- dali-csharp-binder/common/signal-wrap.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dali-csharp-binder/common/signal-wrap.cpp b/dali-csharp-binder/common/signal-wrap.cpp index b179893a..aa14b342 100644 --- a/dali-csharp-binder/common/signal-wrap.cpp +++ b/dali-csharp-binder/common/signal-wrap.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Samsung Electronics Co., Ltd. + * Copyright (c) 2024 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -72,10 +72,11 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Signal_StringToVoid_Disconnect(void *arg } SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_Signal_StringToVoid_new() { + StringToVoidSignal* ret = nullptr; try_catch(([&]() { - return new StringToVoidSignal(); + ret = new StringToVoidSignal(); })); - return nullptr; + return ret; } SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Signal_StringToVoid_delete(void *arg1) { @@ -161,10 +162,11 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Signal_GesturePairToVoid_Emit(void *arg1 } SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_Signal_GesturePairToVoid_new() { + GesturePairSignal* ret = nullptr; try_catch(([&]() { - return new GesturePairSignal(); + ret = new GesturePairSignal(); })); - return nullptr; + return ret; } SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Signal_GesturePairToVoid_delete(void *arg1) { -- 2.34.1