diff --git a/include/nlohmann/detail/output/binary_writer.hpp b/include/nlohmann/detail/output/binary_writer.hpp index 9423635f0..dfe757f0a 100644 --- a/include/nlohmann/detail/output/binary_writer.hpp +++ b/include/nlohmann/detail/output/binary_writer.hpp @@ -661,18 +661,18 @@ class binary_writer } else if (N <= (std::numeric_limits::max)()) { - std::uint8_t output_type = use_ext - ? 0xC8 // ext 16 - : 0xC5; // bin 16 + const std::uint8_t output_type = use_ext + ? 0xC8 // ext 16 + : 0xC5; // bin 16 oa->write_character(to_char_type(output_type)); write_number(static_cast(N)); } else if (N <= (std::numeric_limits::max)()) { - std::uint8_t output_type = use_ext - ? 0xC9 // ext 32 - : 0xC6; // bin 32 + const std::uint8_t output_type = use_ext + ? 0xC9 // ext 32 + : 0xC6; // bin 32 oa->write_character(to_char_type(output_type)); write_number(static_cast(N)); @@ -1258,8 +1258,8 @@ class binary_writer */ static std::size_t calc_bson_object_size(const typename BasicJsonType::object_t& value) { - std::size_t document_size = std::accumulate(value.begin(), value.end(), static_cast(0), - [](size_t result, const typename BasicJsonType::object_t::value_type & el) + const std::size_t document_size = std::accumulate(value.begin(), value.end(), static_cast(0), + [](size_t result, const typename BasicJsonType::object_t::value_type & el) { return result += calc_bson_element_size(el.first, el.second); }); diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index 342fc0958..7a2f9dabb 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -15614,18 +15614,18 @@ class binary_writer } else if (N <= (std::numeric_limits::max)()) { - std::uint8_t output_type = use_ext - ? 0xC8 // ext 16 - : 0xC5; // bin 16 + const std::uint8_t output_type = use_ext + ? 0xC8 // ext 16 + : 0xC5; // bin 16 oa->write_character(to_char_type(output_type)); write_number(static_cast(N)); } else if (N <= (std::numeric_limits::max)()) { - std::uint8_t output_type = use_ext - ? 0xC9 // ext 32 - : 0xC6; // bin 32 + const std::uint8_t output_type = use_ext + ? 0xC9 // ext 32 + : 0xC6; // bin 32 oa->write_character(to_char_type(output_type)); write_number(static_cast(N)); @@ -16211,8 +16211,8 @@ class binary_writer */ static std::size_t calc_bson_object_size(const typename BasicJsonType::object_t& value) { - std::size_t document_size = std::accumulate(value.begin(), value.end(), static_cast(0), - [](size_t result, const typename BasicJsonType::object_t::value_type & el) + const std::size_t document_size = std::accumulate(value.begin(), value.end(), static_cast(0), + [](size_t result, const typename BasicJsonType::object_t::value_type & el) { return result += calc_bson_element_size(el.first, el.second); }); diff --git a/tests/src/make_test_data_available.hpp b/tests/src/make_test_data_available.hpp index 83b926621..26f2bc146 100644 --- a/tests/src/make_test_data_available.hpp +++ b/tests/src/make_test_data_available.hpp @@ -18,7 +18,7 @@ namespace utils inline bool check_testsuite_downloaded() { - std::unique_ptr file(std::fopen(TEST_DATA_DIRECTORY "/README.md", "r"), &std::fclose); + const std::unique_ptr file(std::fopen(TEST_DATA_DIRECTORY "/README.md", "r"), &std::fclose); return file != nullptr; } diff --git a/tests/src/unit-assert_macro.cpp b/tests/src/unit-assert_macro.cpp index 7189119c0..e0307e62a 100644 --- a/tests/src/unit-assert_macro.cpp +++ b/tests/src/unit-assert_macro.cpp @@ -32,7 +32,7 @@ TEST_CASE("JSON_ASSERT(x)") assert_counter = 0; CHECK(assert_counter == 0); - json::iterator it; + const json::iterator it; json j; // in case assertions do not abort execution, an exception is thrown diff --git a/tests/src/unit-binary_formats.cpp b/tests/src/unit-binary_formats.cpp index 463360ad5..ca6a7abfa 100644 --- a/tests/src/unit-binary_formats.cpp +++ b/tests/src/unit-binary_formats.cpp @@ -19,7 +19,7 @@ TEST_CASE("Binary Formats" * doctest::skip()) SECTION("canada.json") { const auto* filename = TEST_DATA_DIRECTORY "/nativejson-benchmark/canada.json"; - json j = json::parse(std::ifstream(filename)); + const json j = json::parse(std::ifstream(filename)); const auto json_size = j.dump().size(); const auto bjdata_1_size = json::to_bjdata(j).size(); @@ -58,7 +58,7 @@ TEST_CASE("Binary Formats" * doctest::skip()) SECTION("twitter.json") { const auto* filename = TEST_DATA_DIRECTORY "/nativejson-benchmark/twitter.json"; - json j = json::parse(std::ifstream(filename)); + const json j = json::parse(std::ifstream(filename)); const auto json_size = j.dump().size(); const auto bjdata_1_size = json::to_bjdata(j).size(); @@ -97,7 +97,7 @@ TEST_CASE("Binary Formats" * doctest::skip()) SECTION("citm_catalog.json") { const auto* filename = TEST_DATA_DIRECTORY "/nativejson-benchmark/citm_catalog.json"; - json j = json::parse(std::ifstream(filename)); + const json j = json::parse(std::ifstream(filename)); const auto json_size = j.dump().size(); const auto bjdata_1_size = json::to_bjdata(j).size(); @@ -175,7 +175,7 @@ TEST_CASE("Binary Formats" * doctest::skip()) SECTION("sample.json") { const auto* filename = TEST_DATA_DIRECTORY "/json_testsuite/sample.json"; - json j = json::parse(std::ifstream(filename)); + const json j = json::parse(std::ifstream(filename)); const auto json_size = j.dump().size(); const auto bjdata_1_size = json::to_bjdata(j).size();