Update tizen code too

project-chip · Sep 26, 2024 · db933d5 · db933d5
1 parent 44fa676
commit db933d5
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/src/platform/Tizen/PlatformManagerImpl.h b/src/platform/Tizen/PlatformManagerImpl.h
@@ -64,16 +64,21 @@ class PlatformManagerImpl final : public PlatformManager, public Internal::Gener
     template <typename T>
     CHIP_ERROR GLibMatterContextInvokeSync(CHIP_ERROR (*func)(T *), T * userData)
     {
-        CHIP_ERROR LambdaErrorReturn;
+        struct
+        {
+            CHIP_ERROR returnValue = CHIP_NO_ERROR;
+            CHIP_ERROR (*functionToCall)(T *);
+            T * userData;
+        } context;
 
-        // wrapping the function pointer and userData into a Lambda, to be stored and passed as a LambdaBridge
-        auto lambda = [func, userData](CHIP_ERROR * apErrorReturn) { *apErrorReturn = func(userData); };
+        context.functionToCall = func;
+        context.userData       = userData;
 
         LambdaBridge bridge;
-        bridge.Initialize(lambda, &LambdaErrorReturn);
-        _GLibMatterContextInvokeSync(std::move(bridge));
+        bridge.Initialize([&context]() { context.returnValue = context.functionToCall(context.userData); });
 
-        return LambdaErrorReturn;
+        _GLibMatterContextInvokeSync(std::move(bridge));
+        return context.returnValue;
     }
     System::Clock::Timestamp GetStartTime() { return mStartTime; }