From 9e5e23aad64560d428c0f443fc0d1f53198f4438 Mon Sep 17 00:00:00 2001
From: Vincent Coubard <vincent.coubard@arm.com>
Date: Thu, 28 Feb 2019 11:37:21 +0000
Subject: [PATCH] BLE - Remove conditional directive in construction of Cordio
 objects.

---
 .../TARGET_CORDIO/source/CordioBLE.cpp        | 24 +++++--------------
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/features/FEATURE_BLE/targets/TARGET_CORDIO/source/CordioBLE.cpp b/features/FEATURE_BLE/targets/TARGET_CORDIO/source/CordioBLE.cpp
index 4ae6617416..bfaacee2e7 100644
--- a/features/FEATURE_BLE/targets/TARGET_CORDIO/source/CordioBLE.cpp
+++ b/features/FEATURE_BLE/targets/TARGET_CORDIO/source/CordioBLE.cpp
@@ -36,9 +36,7 @@
 #include "mbed_assert.h"
 
 #include "CordioPalAttClient.h"
-#if BLE_FEATURE_SECURITY
 #include "CordioPalSecurityManager.h"
-#endif // BLE_FEATURE_SECURITY
 
 /*! WSF handler ID */
 wsfHandlerId_t stack_handler_id;
@@ -182,13 +180,9 @@ impl::GenericGapImpl& BLE::getGap()
     static pal::vendor::cordio::GenericAccessService cordio_gap_service;
     static impl::GenericGapImpl gap(
         _event_queue,
-        impl::PalGapImpl::get_gap()
-#if BLE_FEATURE_GATT_SERVER
-        , cordio_gap_service
-#endif
-#if BLE_FEATURE_SECURITY
-        , impl::PalSecurityManagerImpl::get_security_manager()
-#endif
+        impl::PalGapImpl::get_gap(),
+        cordio_gap_service,
+        impl::PalSecurityManagerImpl::get_security_manager()
     );
 
     return gap;
@@ -233,17 +227,11 @@ impl::PalGattClientImpl& BLE::getPalGattClient()
 #if BLE_FEATURE_SECURITY
 SecurityManager& BLE::getSecurityManager()
 {
-#if BLE_FEATURE_SIGNING
     static vendor::cordio::SigningEventMonitor<impl::GenericSecurityManagerImpl> signing_event_monitor;
-#endif
     static impl::GenericSecurityManagerImpl m_instance(
-        impl::PalSecurityManagerImpl::get_security_manager()
-#if BLE_FEATURE_CONNECTABLE
-        , getGap()
-#endif
-#if BLE_FEATURE_SIGNING
-        , signing_event_monitor
-#endif
+        impl::PalSecurityManagerImpl::get_security_manager(),
+        getGap(),
+        signing_event_monitor
     );
 
     return m_instance;