From bc10a09c4eaf54db66b53342783accbe6705e5ee Mon Sep 17 00:00:00 2001
From: Vincent Coubard <vincent.coubard@arm.com>
Date: Thu, 28 Feb 2019 11:24:08 +0000
Subject: [PATCH] BLE - Remove conditional directive removing functions in pal.

---
 features/FEATURE_BLE/ble/pal/PalSecurityManager.h  | 10 ----------
 features/FEATURE_BLE/ble/pal/SigningEventMonitor.h |  3 ---
 2 files changed, 13 deletions(-)

diff --git a/features/FEATURE_BLE/ble/pal/PalSecurityManager.h b/features/FEATURE_BLE/ble/pal/PalSecurityManager.h
index e0fa224df5..37c0c16190 100644
--- a/features/FEATURE_BLE/ble/pal/PalSecurityManager.h
+++ b/features/FEATURE_BLE/ble/pal/PalSecurityManager.h
@@ -520,7 +520,6 @@ public:
         impl()->on_keys_distributed_local_ediv_rand_(connection, ediv, rand);
     }
 
-#if BLE_FEATURE_PRIVACY
     /**
      * Store the results of key distribution after IRK has been received.
      *
@@ -533,7 +532,6 @@ public:
     ) {
         impl()->on_keys_distributed_irk_(connection, irk);
     }
-#endif // BLE_FEATURE_PRIVACY
 
     /**
      * Store the identity address of the peer after it has been distributed.
@@ -554,7 +552,6 @@ public:
         );
     }
 
-#if BLE_FEATURE_SIGNING
     /**
      * Store the peer's CSRK after it has been distributed.
      *
@@ -567,7 +564,6 @@ public:
     ) {
         impl()->on_keys_distributed_csrk(connection, csrk);
     }
-#endif // BLE_FEATURE_SIGNING
 
     /**
      * Request the LTK since the peer is asking us to encrypt the link. We need to
@@ -650,7 +646,6 @@ public:
     ////////////////////////////////////////////////////////////////////////////
     // Resolving list management
     //
-#if BLE_FEATURE_PRIVACY
     /**
      * Return the number of address translation entries that can be stored by the
      * subsystem.
@@ -712,7 +707,6 @@ public:
     ble_error_t clear_resolving_list() {
         return impl()->clear_resolving_list_();
     }
-#endif // BLE_FEATURE_PRIVACY
 
     ////////////////////////////////////////////////////////////////////////////
     // Pairing
@@ -1013,7 +1007,6 @@ public:
         return impl()->set_ltk_not_found_(connection);
     }
 
-#if BLE_FEATURE_PRIVACY
     /**
      * Set the local IRK.
      *
@@ -1025,9 +1018,7 @@ public:
     ) {
         return impl()->set_irk_(irk);
     }
-#endif // BLE_FEATURE_PRIVACY
 
-#if BLE_FEATURE_SIGNING
     /**
      * Set the local CSRK.
      *
@@ -1068,7 +1059,6 @@ public:
     ble_error_t remove_peer_csrk(connection_handle_t connection) {
         return impl()->remove_peer_csrk_(connection);
     }
-#endif // BLE_FEATURE_SIGNING
 
     ////////////////////////////////////////////////////////////////////////////
     // Authentication
diff --git a/features/FEATURE_BLE/ble/pal/SigningEventMonitor.h b/features/FEATURE_BLE/ble/pal/SigningEventMonitor.h
index 70b01aee57..5a299c68e3 100644
--- a/features/FEATURE_BLE/ble/pal/SigningEventMonitor.h
+++ b/features/FEATURE_BLE/ble/pal/SigningEventMonitor.h
@@ -23,7 +23,6 @@
 namespace ble {
 namespace pal {
 
-#if BLE_FEATURE_SIGNING
 /**
  * Implemented by classes that are reacting to signing events.
  */
@@ -93,8 +92,6 @@ public:
     }
 };
 
-#endif // BLE_FEATURE_SIGNING
-
 } // namespace pal
 } // namespace ble