From 7767f7b5f6a9f345e3383ea3128c653e6651dbea Mon Sep 17 00:00:00 2001 From: hhvrc Date: Thu, 16 Jan 2025 13:09:45 +0100 Subject: [PATCH] Fix usage of push_back vs emplace_back --- include/config/internal/utils.h | 4 ++-- src/config/WiFiConfig.cpp | 2 +- src/serial/command_handlers/networks.cpp | 2 +- src/util/StringUtils.cpp | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/config/internal/utils.h b/include/config/internal/utils.h index af66f054..cb0144cc 100644 --- a/include/config/internal/utils.h +++ b/include/config/internal/utils.h @@ -41,7 +41,7 @@ namespace OpenShock::Config::Internal::Utils { for (auto fbsItem : *fbsVec) { T item; if (item.FromFlatbuffers(fbsItem)) { - vec.emplace_back(std::move(item)); + vec.push_back(std::move(item)); } } } @@ -77,7 +77,7 @@ namespace OpenShock::Config::Internal::Utils { { T item; if (item.FromJSON(jsonItem)) { - vec.emplace_back(std::move(item)); + vec.push_back(std::move(item)); } } diff --git a/src/config/WiFiConfig.cpp b/src/config/WiFiConfig.cpp index cc06854e..986e6725 100644 --- a/src/config/WiFiConfig.cpp +++ b/src/config/WiFiConfig.cpp @@ -46,7 +46,7 @@ flatbuffers::Offset WiFiCon fbsCredentialsList.reserve(credentialsList.size()); for (auto& credentials : credentialsList) { - fbsCredentialsList.emplace_back(credentials.ToFlatbuffers(builder, withSensitiveData)); + fbsCredentialsList.push_back(credentials.ToFlatbuffers(builder, withSensitiveData)); } return Serialization::Configuration::CreateWiFiConfig(builder, builder.CreateString(accessPointSSID), builder.CreateString(hostname), builder.CreateVector(fbsCredentialsList)); diff --git a/src/serial/command_handlers/networks.cpp b/src/serial/command_handlers/networks.cpp index 7eacd779..639deae7 100644 --- a/src/serial/command_handlers/networks.cpp +++ b/src/serial/command_handlers/networks.cpp @@ -67,7 +67,7 @@ void _handleNetworksCommand(std::string_view arg, bool isAutomated) OS_LOGI(TAG, "Adding network \"%s\" to config, id=%u", cred.ssid.c_str(), cred.id); - creds.emplace_back(std::move(cred)); + creds.push_back(std::move(cred)); } if (!OpenShock::Config::SetWiFiCredentials(creds)) { diff --git a/src/util/StringUtils.cpp b/src/util/StringUtils.cpp index 8a555232..588fe17b 100644 --- a/src/util/StringUtils.cpp +++ b/src/util/StringUtils.cpp @@ -96,7 +96,7 @@ std::vector OpenShock::StringSplit(std::string_view view, bool for (const char* ptr = view.begin(); ptr < view.end(); ++ptr) { if (predicate(*ptr)) { if (start != nullptr) { - result.emplace_back(std::string_view(start, ptr - start)); + result.emplace_back(start, ptr - start); start = nullptr; } } else if (start == nullptr) { @@ -105,7 +105,7 @@ std::vector OpenShock::StringSplit(std::string_view view, bool } if (start != nullptr) { - result.emplace_back(std::string_view(start, view.end() - start)); + result.emplace_back(start, view.end() - start); } return result;