espressif/esp-protocols
1
0
Fork 1
mirror of https://github.com/espressif/esp-protocols.git synced 2025-07-30 18:57:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(modem): Fix incompatible iterator in std::search() in new gcc

Browse Source 
Creates a temporary string view and uses find() instead.
This commit is contained in:
David Cermak
2025-07-01 14:04:54 +02:00
parent a8631eecf5
commit ed0f633418
1 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
components/esp_modem/examples/modem_tcp_client/main/sock_commands_bg96.cpp
View File

@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2022-2025 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@ -130,12 +130,15 @@ Responder::ret Responder::recv(uint8_t *data, size_t len)
auto *recv_data = (char *)data; auto *recv_data = (char *)data;
if (data_to_recv == 0) { if (data_to_recv == 0) {
const std::string_view head = "+QIRD: "; const std::string_view head = "+QIRD: ";
auto head_pos = std::search(recv_data, recv_data + len, head.begin(), head.end()); const std::string_view recv_data_view = std::string_view(recv_data, len);
if (head_pos == recv_data + len) { auto head_pos_found = recv_data_view.find(head);
if (head_pos_found == std::string_view::npos) {
return ret::FAIL; return ret::FAIL;
} }
auto *head_pos = recv_data + head_pos_found;
auto next_nl = (char *)memchr(head_pos + head.size(), '\n', MIN_MESSAGE); auto next_nl = (char *)memchr(head_pos + head.size(), '\n', MIN_MESSAGE);
if (next_nl == nullptr) { if (next_nl == nullptr) {
return ret::FAIL; return ret::FAIL;
} }