From 490ad6a7d6b8405e77c9323819da45e2e872dfd4 Mon Sep 17 00:00:00 2001 From: Jochen Topf Date: Fri, 7 Jun 2024 13:58:07 +0200 Subject: [PATCH] Avoid warnings for integer conversions from MSVC --- src/osm2pgsql.cpp | 2 +- src/pgsql.hpp | 4 ++-- tests/test-lua-utils.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/osm2pgsql.cpp b/src/osm2pgsql.cpp index 6d4ee7934..f6bb541bd 100644 --- a/src/osm2pgsql.cpp +++ b/src/osm2pgsql.cpp @@ -240,7 +240,7 @@ static void check_db_format(properties_t const &properties, options_t *options) throw fmt_error("Unknown db_format '{}' in properties.", format); } - options->middle_database_format = format; + options->middle_database_format = static_cast(format); } static void check_output(properties_t const &properties, options_t *options) diff --git a/src/pgsql.hpp b/src/pgsql.hpp index ad3959c1b..9712e7a4d 100644 --- a/src/pgsql.hpp +++ b/src/pgsql.hpp @@ -262,10 +262,10 @@ class pg_conn_t if constexpr (std::is_same_v) { return param; } else if constexpr (std::is_same_v) { - *length = param.size(); + *length = static_cast(param.size()); return param.c_str(); } else if constexpr (std::is_same_v) { - *length = param.size(); + *length = static_cast(param.size()); *bin = 1; return param.data(); } diff --git a/tests/test-lua-utils.cpp b/tests/test-lua-utils.cpp index abd11f2cd..b1b6cf04a 100644 --- a/tests/test-lua-utils.cpp +++ b/tests/test-lua-utils.cpp @@ -89,7 +89,7 @@ TEST_CASE("luaX_for_each should call function n times", "[NoDB]") luaL_newstate(), [](lua_State *state) { lua_close(state); }}; test_lua(lua_state.get(), "return { 3, 4, 5 }", [&](){ - int sum = 0; + lua_Number sum = 0; luaX_for_each(lua_state.get(), [&]() { sum += lua_tonumber(lua_state.get(), -1); });