Scarfski/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2026-10-01 14:35:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix CI: clang-tidy and GCC -Wnoexcept in the locale test (#5613)

Browse Source 
#5597 was merged before all of its CI jobs had run, and two of them fail
on develop now, and so on every pull request:

- ci_clang_tidy: cert-err33-c for the two std::setlocale(LC_NUMERIC, "C")
  calls whose result was discarded. Check the result, like the other
  resets in the file.
- ci_test_standards_gcc (20) with GCC 16: -Wnoexcept for the two parser
  callbacks, which cannot throw but were not declared noexcept.

Signed-off-by: Niels Lohmann <mail@nlohmann.me>
This commit is contained in:
Niels Lohmann
2026-09-28 22:20:43 +02:00
committed by GitHub
parent fc03b9912e
commit 633de8e44b
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/src/unit-locale-cpp.cpp
View File

@@ -309,7 +309,7 @@ TEST_CASE("locale changes between lexer construction and number conversion (#519
// DOM parsing with a callback // DOM parsing with a callback
{ {
bool switched = false; bool switched = false;
const auto cb = [&](int /*depth*/, json::parse_event_t event, json& /*parsed*/) const auto cb = [&](int /*depth*/, json::parse_event_t event, json& /*parsed*/) noexcept
{ {
if (event == json::parse_event_t::array_start) if (event == json::parse_event_t::array_start)
{ {
@@ -327,7 +327,7 @@ TEST_CASE("locale changes between lexer construction and number conversion (#519
// a long double goes through std::strtold unless std::from_chars supports it // a long double goes through std::strtold unless std::from_chars supports it
{ {
bool switched = false; bool switched = false;
const auto cb = [&](int /*depth*/, long_double_json::parse_event_t event, long_double_json& /*parsed*/) const auto cb = [&](int /*depth*/, long_double_json::parse_event_t event, long_double_json& /*parsed*/) noexcept
{ {
if (event == long_double_json::parse_event_t::array_start) if (event == long_double_json::parse_event_t::array_start)
{ {
@@ -343,7 +343,7 @@ TEST_CASE("locale changes between lexer construction and number conversion (#519
} }
} }
std::setlocale(LC_NUMERIC, "C"); CHECK(std::setlocale(LC_NUMERIC, "C") != nullptr);
} }
TEST_CASE("locale with a multi-byte decimal point") TEST_CASE("locale with a multi-byte decimal point")
@@ -383,5 +383,5 @@ TEST_CASE("locale with a multi-byte decimal point")
MESSAGE("no locale with a multi-byte decimal point is usable"); MESSAGE("no locale with a multi-byte decimal point is usable");
} }
std::setlocale(LC_NUMERIC, "C"); CHECK(std::setlocale(LC_NUMERIC, "C") != nullptr);
} }