From bc05628fa8b93da907052c9d620d08d25873f4f8 Mon Sep 17 00:00:00 2001 From: Evil Eye Date: Wed, 30 Jul 2025 20:44:59 +0200 Subject: [PATCH] Resolve unused code warnings when compiling in Debug mode using MSVC --- apps/components_tests/lua/testscriptscontainer.cpp | 3 ++- apps/esmtool/esmtool.cpp | 2 -- apps/openmw/mwrender/animation.cpp | 4 ++-- components/fx/technique.cpp | 12 ++++++------ components/fx/types.hpp | 12 ++++++------ components/lua/scriptscontainer.cpp | 5 +++-- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/apps/components_tests/lua/testscriptscontainer.cpp b/apps/components_tests/lua/testscriptscontainer.cpp index 4f3cca1b87..9c4c656b32 100644 --- a/apps/components_tests/lua/testscriptscontainer.cpp +++ b/apps/components_tests/lua/testscriptscontainer.cpp @@ -638,8 +638,9 @@ CUSTOM: customdata.lua sol::object deserialized = LuaUtil::deserialize(lua.sol(), data2.mScripts[0].mData, &serializer1); EXPECT_TRUE(deserialized.is()); sol::table table = deserialized; - for (const auto& [key, value] : table) + if (!table.empty()) { + const auto [key, value] = *table.cbegin(); EXPECT_TRUE(key.is()); EXPECT_TRUE(value.is()); EXPECT_EQ(key.as(), (ESM::RefNum{ 42, 34 })); diff --git a/apps/esmtool/esmtool.cpp b/apps/esmtool/esmtool.cpp index 0473676f93..7cdc2bcd98 100644 --- a/apps/esmtool/esmtool.cpp +++ b/apps/esmtool/esmtool.cpp @@ -215,8 +215,6 @@ int main(int argc, char** argv) std::cerr << "ERROR: " << e.what() << std::endl; return 1; } - - return 0; } namespace diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp index d22e12ff01..5912895855 100644 --- a/apps/openmw/mwrender/animation.cpp +++ b/apps/openmw/mwrender/animation.cpp @@ -1117,8 +1117,8 @@ namespace MWRender return keyframeController->getAsCallback(); } - - return asCallback; + else + return asCallback; } void Animation::resetActiveGroups() diff --git a/components/fx/technique.cpp b/components/fx/technique.cpp index 5865298fe5..a88a1a62bb 100644 --- a/components/fx/technique.cpp +++ b/components/fx/technique.cpp @@ -528,8 +528,6 @@ namespace Fx { return parseBool(); } - - error(Misc::StringUtils::format("failed setting uniform type")); } template @@ -557,10 +555,12 @@ namespace Fx { if constexpr (std::is_same_v) error("bool arrays currently unsupported"); - - int size = parseInteger(); - if (size > 1) - data.mArray = std::vector(size); + else + { + int size = parseInteger(); + if (size > 1) + data.mArray = std::vector(size); + } } else if (key == "min") { diff --git a/components/fx/types.hpp b/components/fx/types.hpp index ddfa966010..440bc69470 100644 --- a/components/fx/types.hpp +++ b/components/fx/types.hpp @@ -220,10 +220,11 @@ namespace Fx return osg::Uniform::FLOAT; else if constexpr (std::is_same_v) return osg::Uniform::INT; - else if constexpr (std::is_same_v) + else + { + static_assert(std::is_same_v, "Non-exhaustive visitor"); return osg::Uniform::BOOL; - - return std::nullopt; + } }, mData); } @@ -293,15 +294,14 @@ namespace Fx return Misc::StringUtils::format("const int %s=%i;", mName, value); } - else if constexpr (std::is_same_v) + else { + static_assert(std::is_same_v, "Non-exhaustive visitor"); if (useUniform) return Misc::StringUtils::format("uniform bool %s;", uname); return Misc::StringUtils::format("const bool %s=%s;", mName, value ? "true" : "false"); } - - return std::nullopt; }, mData); } diff --git a/components/lua/scriptscontainer.cpp b/components/lua/scriptscontainer.cpp index 5eff211894..cdeb528205 100644 --- a/components/lua/scriptscontainer.cpp +++ b/components/lua/scriptscontainer.cpp @@ -215,12 +215,13 @@ namespace LuaUtil return true; } } + return false; } - else if constexpr (std::is_same_v) + else { + static_assert(std::is_same_v, "Non-exhaustive visitor"); return variant.mScripts.count(scriptId) != 0; } - return false; }, mData); }