From 085a7fb76fff80919ff02157e355194a3f26fd57 Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Wed, 7 Jun 2023 20:13:43 +0200 Subject: [PATCH] :rewind: remove std::forward in loops --- include/nlohmann/ordered_map.hpp | 16 ++++++++-------- single_include/nlohmann/json.hpp | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/include/nlohmann/ordered_map.hpp b/include/nlohmann/ordered_map.hpp index 413ddb7ea..b7c24008c 100644 --- a/include/nlohmann/ordered_map.hpp +++ b/include/nlohmann/ordered_map.hpp @@ -122,7 +122,7 @@ template , { for (auto it = this->begin(); it != this->end(); ++it) { - if (m_compare(it->first, std::forward(key))) + if (m_compare(it->first, key)) // NOLINT(cppcoreguidelines-missing-std-forward) { return it->second; } @@ -150,7 +150,7 @@ template , { for (auto it = this->begin(); it != this->end(); ++it) { - if (m_compare(it->first, std::forward(key))) + if (m_compare(it->first, key)) // NOLINT(cppcoreguidelines-missing-std-forward) { return it->second; } @@ -184,10 +184,10 @@ template , { for (auto it = this->begin(); it != this->end(); ++it) { - if (m_compare(it->first, std::forward(key))) - { - // Since we cannot move const Keys, re-construct them in place - for (auto next = it; ++next != this->end(); ++it) + if (m_compare(it->first, key) // NOLINT(cppcoreguidelines-missing-std-forward) + { + // Since we cannot move const Keys, re-construct them in place + for (auto next = it; ++next != this->end(); ++it) { it->~value_type(); // Destroy but keep allocation new (&*it) value_type{std::move(*next)}; @@ -275,7 +275,7 @@ template , { for (auto it = this->begin(); it != this->end(); ++it) { - if (m_compare(it->first, std::forward(key))) + if (m_compare(it->first, key))// NOLINT(cppcoreguidelines-missing-std-forward) { return 1; } @@ -301,7 +301,7 @@ template , { for (auto it = this->begin(); it != this->end(); ++it) { - if (m_compare(it->first, std::forward(key))) + if (m_compare(it->first, key)) // NOLINT(cppcoreguidelines-missing-std-forward) { return it; } diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index 6ff98b01a..d55be0026 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -19040,7 +19040,7 @@ template , { for (auto it = this->begin(); it != this->end(); ++it) { - if (m_compare(it->first, std::forward(key))) + if (m_compare(it->first, key)) // NOLINT(cppcoreguidelines-missing-std-forward) { return it->second; } @@ -19068,7 +19068,7 @@ template , { for (auto it = this->begin(); it != this->end(); ++it) { - if (m_compare(it->first, std::forward(key))) + if (m_compare(it->first, key)) // NOLINT(cppcoreguidelines-missing-std-forward) { return it->second; } @@ -19102,10 +19102,10 @@ template , { for (auto it = this->begin(); it != this->end(); ++it) { - if (m_compare(it->first, std::forward(key))) - { - // Since we cannot move const Keys, re-construct them in place - for (auto next = it; ++next != this->end(); ++it) + if (m_compare(it->first, key) // NOLINT(cppcoreguidelines-missing-std-forward) + { + // Since we cannot move const Keys, re-construct them in place + for (auto next = it; ++next != this->end(); ++it) { it->~value_type(); // Destroy but keep allocation new (&*it) value_type{std::move(*next)}; @@ -19193,7 +19193,7 @@ template , { for (auto it = this->begin(); it != this->end(); ++it) { - if (m_compare(it->first, std::forward(key))) + if (m_compare(it->first, key))// NOLINT(cppcoreguidelines-missing-std-forward) { return 1; } @@ -19219,7 +19219,7 @@ template , { for (auto it = this->begin(); it != this->end(); ++it) { - if (m_compare(it->first, std::forward(key))) + if (m_compare(it->first, key)) // NOLINT(cppcoreguidelines-missing-std-forward) { return it; }