h2zero/esp-nimble-cpp
1
0
Fork 1
mirror of https://github.com/h2zero/esp-nimble-cpp.git synced 2025-07-30 10:27:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

[Bugfix] Explicit getValue template returning nil value with convertable types.

Browse Source
This commit is contained in:
h2zero
2025-04-23 12:59:25 -06:00
committed by Ryan Powell
parent 54ec3f4c92
commit e18d78678f
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/NimBLEAttValue.h
View File

@ -305,9 +305,6 @@ class NimBLEAttValue {
*/ */
template <typename T> template <typename T>
T getValue(time_t* timestamp = nullptr, bool skipSizeCheck = false) const { T getValue(time_t* timestamp = nullptr, bool skipSizeCheck = false) const {
if (!skipSizeCheck && size() < sizeof(T)) {
return T();
}
if (timestamp != nullptr) { if (timestamp != nullptr) {
# if CONFIG_NIMBLE_CPP_ATT_VALUE_TIMESTAMP_ENABLED # if CONFIG_NIMBLE_CPP_ATT_VALUE_TIMESTAMP_ENABLED
*timestamp = m_timestamp; *timestamp = m_timestamp;
@ -316,7 +313,14 @@ class NimBLEAttValue {
# endif # endif
} }
return *(reinterpret_cast<const T*>(m_attr_value)); if (std::is_convertible<NimBLEAttValue, T>::value) {
return *this;
} else {
if (!skipSizeCheck && size() < sizeof(T)) {
return T();
}
return *(reinterpret_cast<const T*>(m_attr_value));
}
} }
/*********************** Operators ************************/ /*********************** Operators ************************/