diff options
| author | Neil Kolban <kolban1@kolban.com> | 2017-10-02 08:24:17 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-02 08:24:17 -0500 |
| commit | c8e11bcecbf47ea1226f2cd5138d3162a2473be6 (patch) | |
| tree | 98e810ce87dbd3310a1bda62eed18913787a7c1c | |
| parent | Merge pull request #3 from ciotlosm/master (diff) | |
| parent | fix clearing of vectors and maps() (diff) | |
| download | thermostat-c8e11bcecbf47ea1226f2cd5138d3162a2473be6.tar.gz thermostat-c8e11bcecbf47ea1226f2cd5138d3162a2473be6.tar.bz2 thermostat-c8e11bcecbf47ea1226f2cd5138d3162a2473be6.zip | |
Merge pull request #5 from sebastiankliem/master
fix clearing of vectors and maps
| -rw-r--r-- | src/BLEClient.cpp | 2 | ||||
| -rw-r--r-- | src/BLERemoteService.cpp | 2 | ||||
| -rw-r--r-- | src/BLEScan.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/BLEClient.cpp b/src/BLEClient.cpp index a5d60cf..f9b38c3 100644 --- a/src/BLEClient.cpp +++ b/src/BLEClient.cpp @@ -283,7 +283,7 @@ std::map<std::string, BLERemoteService*>* BLEClient::getServices() { * and will culminate with an ESP_GATTC_SEARCH_CMPL_EVT when all have been received. */ ESP_LOGD(LOG_TAG, ">> getServices"); - m_servicesMap.empty(); + m_servicesMap.clear(); esp_err_t errRc = esp_ble_gattc_search_service( getGattcIf(), getConnId(), diff --git a/src/BLERemoteService.cpp b/src/BLERemoteService.cpp index a29a758..4d18625 100644 --- a/src/BLERemoteService.cpp +++ b/src/BLERemoteService.cpp @@ -196,7 +196,7 @@ void BLERemoteService::removeCharacteristics() { for (auto &myPair : m_characteristicMap) { delete myPair.second; } - m_characteristicMap.empty(); + m_characteristicMap.clear(); } // removeCharacteristics diff --git a/src/BLEScan.cpp b/src/BLEScan.cpp index 9fdcffd..54fcac0 100644 --- a/src/BLEScan.cpp +++ b/src/BLEScan.cpp @@ -204,7 +204,7 @@ BLEScanResults BLEScan::start(uint32_t duration) { m_semaphoreScanEnd.take("start"); - m_scanResults.m_vectorAdvertisedDevices.empty(); + m_scanResults.m_vectorAdvertisedDevices.clear(); esp_err_t errRc = ::esp_ble_gap_set_scan_params(&m_scan_params); |