name clash fixed

pull/6188/head
paul-szczepanek-arm 2018-01-17 10:48:07 +00:00
parent 943206dd07
commit 9c6f57a733
1 changed files with 2 additions and 3 deletions

View File

@ -223,9 +223,8 @@ public:
// Feature support // Feature support
// //
ble_error_t allowLegacyPairing(bool allow = true) { ble_error_t allowLegacyPairing(bool allow = true) {
allowLegacyPairing = allow; legacyPairingAllowed = allow;
return BLE_ERROR_NONE; return BLE_ERROR_NONE;
} }
@ -412,7 +411,7 @@ private:
bool authorisationRequired; bool authorisationRequired;
bool keypressNotification; bool keypressNotification;
bool oobProvidesMitmProtection; bool oobProvidesMitmProtection;
bool allowLegacyPairing; bool legacyPairingAllowed;
authentication_t authentication; authentication_t authentication;
uint8_t minKeySize; uint8_t minKeySize;