ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

normalised the getters const insanity

pull/6932/head
paul-szczepanek-arm 2018-04-09 12:14:52 +01:00
parent 57149b69e4
commit be912ded5b
2 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
features/FEATURE_BLE/targets/TARGET_CORDIO/CordioBLE.h
View File

@ -85,12 +85,12 @@ public:
/**
* @see BLEInstanceBase::getGap
*/
virtual ::Gap& getGap();
virtual generic::GenericGap& getGap();
/**
* @see BLEInstanceBase::getGap
*/
virtual const ::Gap& getGap() const;
virtual const generic::GenericGap& getGap() const;
/**
* @see BLEInstanceBase::getGattServer
@ -105,7 +105,7 @@ public:
/**
* @see BLEInstanceBase::getGattClient
*/
virtual ::GattClient &getGattClient();
virtual generic::GenericGattClient &getGattClient();
/**
* @see BLEInstanceBase::getSecurityManager

24
features/FEATURE_BLE/targets/TARGET_CORDIO/source/CordioBLE.cpp
View File

@ -164,19 +164,12 @@ const char* BLE::getVersion()
return version;
}
::Gap& BLE::getGap()
generic::GenericGap& BLE::getGap()
{
typedef ::Gap& return_type;
const BLE* self = this;
return const_cast<return_type>(self->getGap());
return const_cast<generic::GenericGap&>(getGap());
}
const ::Gap& BLE::getGap() const
{
return getGenericGap();
};
const generic::GenericGap& BLE::getGenericGap() const
const generic::GenericGap& BLE::getGap() const
{
static pal::vendor::cordio::Gap& cordio_pal_gap =
pal::vendor::cordio::Gap::get_gap();
@ -187,7 +180,7 @@ const generic::GenericGap& BLE::getGenericGap() const
cordio_gap_service
);
return gap;
}
};
GattServer& BLE::getGattServer()
{
@ -199,7 +192,7 @@ const GattServer& BLE::getGattServer() const
return cordio::GattServer::getInstance();
}
::GattClient& BLE::getGattClient()
generic::GenericGattClient& BLE::getGattClient()
{
static pal::AttClientToGattClientAdapter pal_client(
pal::vendor::cordio::CordioAttClient::get_client()
@ -211,8 +204,7 @@ const GattServer& BLE::getGattServer() const
SecurityManager& BLE::getSecurityManager()
{
const BLE* self = this;
return const_cast<SecurityManager&>(self->getSecurityManager());
return const_cast<SecurityManager&>(getSecurityManager());
}
const SecurityManager& BLE::getSecurityManager() const
@ -225,8 +217,8 @@ const SecurityManager& BLE::getSecurityManager() const
static generic::GenericSecurityManager m_instance(
m_pal,
m_db,
const_cast<generic::GenericGap&>(getGenericGap()),
static_cast<generic::GenericGattClient&>(self->getGattClient())
self->getGap(),
self->getGattClient()
);
return m_instance;