Darwin: Avoid downcasts in BLEManagerImpl

project-chip · Sep 3, 2023 · 333e520 · 333e520
1 parent 4a8aaba
commit 333e520
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/src/platform/Darwin/BLEManagerImpl.cpp b/src/platform/Darwin/BLEManagerImpl.cpp
@@ -92,7 +92,7 @@ CHIP_ERROR BLEManagerImpl::StartScan(BleScannerDelegate * delegate)
 {
     if (mConnectionDelegate)
     {
-        static_cast<BleConnectionDelegateImpl *>(mConnectionDelegate)->StartScan(delegate);
+        mConnectionDelegate->StartScan(delegate);
         return CHIP_NO_ERROR;
     }
     return CHIP_ERROR_INCORRECT_STATE;
@@ -102,7 +102,7 @@ CHIP_ERROR BLEManagerImpl::StopScan()
 {
     if (mConnectionDelegate)
     {
-        static_cast<BleConnectionDelegateImpl *>(mConnectionDelegate)->StopScan();
+        mConnectionDelegate->StopScan();
         return CHIP_NO_ERROR;
     }
     return CHIP_ERROR_INCORRECT_STATE;

diff --git a/src/platform/Darwin/BLEManagerImpl.h b/src/platform/Darwin/BLEManagerImpl.h
@@ -25,6 +25,8 @@
 
 #if CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
 
+#include <ble/BleLayer.h>
+
 namespace chip {
 namespace DeviceLayer {
 
@@ -34,6 +36,10 @@ namespace Internal {
 
 using namespace chip::Ble;
 
+class BleConnectionDelegateImpl;
+class BlePlatformDelegateImpl;
+class BleApplicationDelegateImpl;
+
 /**
  * Concrete implementation of the BLEManagerImpl singleton object for the Darwin platforms.
  */
@@ -70,9 +76,9 @@ class BLEManagerImpl final : public BLEManager, private BleLayer
 
     static BLEManagerImpl sInstance;
 
-    BleConnectionDelegate * mConnectionDelegate   = nullptr;
-    BlePlatformDelegate * mPlatformDelegate       = nullptr;
-    BleApplicationDelegate * mApplicationDelegate = nullptr;
+    BleConnectionDelegateImpl * mConnectionDelegate   = nullptr;
+    BlePlatformDelegateImpl * mPlatformDelegate       = nullptr;
+    BleApplicationDelegateImpl * mApplicationDelegate = nullptr;
 };
 
 /**