From 504d0a591c808eae4f7c4af74cf6a1ca8d43c6c0 Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Sat, 16 Oct 2021 10:40:30 +0200 Subject: [PATCH] :rewind: revert invalid fix --- include/nlohmann/detail/output/serializer.hpp | 4 ++-- single_include/nlohmann/json.hpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/nlohmann/detail/output/serializer.hpp b/include/nlohmann/detail/output/serializer.hpp index 7fc82b642..fabb3d3b5 100644 --- a/include/nlohmann/detail/output/serializer.hpp +++ b/include/nlohmann/detail/output/serializer.hpp @@ -811,7 +811,7 @@ class serializer // erase thousands separator if (thousands_sep != '\0') { - // NOLINTNEXTLINE(readability-qualified-auto): std::remove returns an iterator, see https://github.com/nlohmann/json/issues/3081 + // NOLINTNEXTLINE(readability-qualified-auto,llvm-qualified-auto): std::remove returns an iterator, see https://github.com/nlohmann/json/issues/3081 const auto end = std::remove(number_buffer.begin(), number_buffer.begin() + len, thousands_sep); std::fill(end, number_buffer.end(), '\0'); JSON_ASSERT((end - number_buffer.begin()) <= len); @@ -821,7 +821,7 @@ class serializer // convert decimal point to '.' if (decimal_point != '\0' && decimal_point != '.') { - // NOLINTNEXTLINE(readability-qualified-auto): std::find returns an iterator, see https://github.com/nlohmann/json/issues/3081 + // NOLINTNEXTLINE(readability-qualified-auto,llvm-qualified-auto): std::find returns an iterator, see https://github.com/nlohmann/json/issues/3081 const auto dec_pos = std::find(number_buffer.begin(), number_buffer.end(), decimal_point); if (dec_pos != number_buffer.end()) { diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index e898a08d0..2ea16391a 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -17235,7 +17235,7 @@ class serializer // erase thousands separator if (thousands_sep != '\0') { - // NOLINTNEXTLINE(readability-qualified-auto): std::remove returns an iterator, see https://github.com/nlohmann/json/issues/3081 + // NOLINTNEXTLINE(readability-qualified-auto,llvm-qualified-auto): std::remove returns an iterator, see https://github.com/nlohmann/json/issues/3081 const auto end = std::remove(number_buffer.begin(), number_buffer.begin() + len, thousands_sep); std::fill(end, number_buffer.end(), '\0'); JSON_ASSERT((end - number_buffer.begin()) <= len); @@ -17245,7 +17245,7 @@ class serializer // convert decimal point to '.' if (decimal_point != '\0' && decimal_point != '.') { - // NOLINTNEXTLINE(readability-qualified-auto): std::find returns an iterator, see https://github.com/nlohmann/json/issues/3081 + // NOLINTNEXTLINE(readability-qualified-auto,llvm-qualified-auto): std::find returns an iterator, see https://github.com/nlohmann/json/issues/3081 const auto dec_pos = std::find(number_buffer.begin(), number_buffer.end(), decimal_point); if (dec_pos != number_buffer.end()) {