From 125c300378ad86e7124db3db02cf435b431cdffa Mon Sep 17 00:00:00 2001 From: sabollim Date: Tue, 2 Apr 2024 21:49:04 +0530 Subject: [PATCH 1/2] fix arm64 build failure when bluetooth enabled on linux platform --- src/platform/Linux/bluez/BluezEndpoint.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/platform/Linux/bluez/BluezEndpoint.cpp b/src/platform/Linux/bluez/BluezEndpoint.cpp index 7cc5814a0e96de..a416b078b31e81 100644 --- a/src/platform/Linux/bluez/BluezEndpoint.cpp +++ b/src/platform/Linux/bluez/BluezEndpoint.cpp @@ -621,7 +621,7 @@ CHIP_ERROR BluezEndpoint::ConnectDevice(BluezDevice1 & aDevice) auto params = std::make_pair(this, &aDevice); mConnectCancellable.reset(g_cancellable_new()); return PlatformMgrImpl().GLibMatterContextInvokeSync( - +[](typeof(params) * aParams) { return aParams->first->ConnectDeviceImpl(*aParams->second); }, ¶ms); + +[](decltype(params) * aParams) { return aParams->first->ConnectDeviceImpl(*aParams->second); }, ¶ms); } void BluezEndpoint::CancelConnect() From a0031119f187fe1380ede594da8f7765f1532e3b Mon Sep 17 00:00:00 2001 From: Arkadiusz Bokowy Date: Mon, 14 Oct 2024 10:00:29 +0200 Subject: [PATCH 2/2] Use C++ keyword for getting type --- src/platform/Tizen/BLEManagerImpl.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/platform/Tizen/BLEManagerImpl.cpp b/src/platform/Tizen/BLEManagerImpl.cpp index 4d4c3e77316fc7..831a9bb74c25ab 100644 --- a/src/platform/Tizen/BLEManagerImpl.cpp +++ b/src/platform/Tizen/BLEManagerImpl.cpp @@ -542,7 +542,7 @@ void BLEManagerImpl::OnChipDeviceScanned(void * device, const Ble::ChipBLEDevice /* Initiate Connect */ auto params = std::make_pair(this, deviceInfo->remote_address); PlatformMgrImpl().GLibMatterContextInvokeSync( - +[](typeof(params) * aParams) { return aParams->first->ConnectChipThing(aParams->second); }, ¶ms); + +[](decltype(params) * aParams) { return aParams->first->ConnectChipThing(aParams->second); }, ¶ms); } void BLEManagerImpl::OnScanComplete()