From c1a7a3a4e48a8fb060f417383bf9aa69a2758eba Mon Sep 17 00:00:00 2001 From: Georg Hagen Date: Mon, 27 Oct 2025 13:54:11 +0100 Subject: [PATCH] Silence some warnings --- openVulkanoCpp/Base/Version.cpp | 13 ++++++------- openVulkanoCpp/Base/Version.hpp | 12 ++++++------ 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/openVulkanoCpp/Base/Version.cpp b/openVulkanoCpp/Base/Version.cpp index 96fca9d..5adc194 100644 --- a/openVulkanoCpp/Base/Version.cpp +++ b/openVulkanoCpp/Base/Version.cpp @@ -88,13 +88,12 @@ namespace OpenVulkano { if (build) return fmt::format("v{}.{}.{}.{}", major, minor, patch, build); - else - return fmt::format("v{}.{}.{}", major, minor, patch); + return fmt::format("v{}.{}.{}", major, minor, patch); } } Version::Version(uint32_t major, uint32_t minor, uint32_t patch, const uint32_t build) - : m_versionComponents(build ? std::initializer_list{major, minor, patch, build} : std::initializer_list{major, minor, patch}) + : m_versionComponents(build ? std::initializer_list{major, minor, patch, build} : std::initializer_list{major, minor, patch}) , m_buildNumber(build) , m_versionString(ToString(major, minor, patch, build)) {} @@ -135,7 +134,7 @@ namespace OpenVulkano } //region Compare functions - int Version::CompareBuildNr(const OpenVulkano::Version& other) const + int Version::CompareBuildNr(const Version& other) const { if (m_buildNumber == 0 || other.m_buildNumber == 0) return 0; if (m_buildNumber > other.m_buildNumber) return 1; @@ -170,7 +169,7 @@ namespace OpenVulkano return 0; } - int Version::Compare(const OpenVulkano::Version& other) const + int Version::Compare(const Version& other) const { int comp; if ((comp = CompareComponents(other)) != 0) return comp; @@ -181,7 +180,7 @@ namespace OpenVulkano namespace { - uint32_t GetDigits(double val) + uint32_t GetDigits(const double val) { if (val == 0) return 0; std::string fracStr = std::to_string(val); @@ -191,7 +190,7 @@ namespace OpenVulkano } } - Version::Version(double version) + Version::Version(const double version) : Version(static_cast(version), GetDigits(version)) {} } diff --git a/openVulkanoCpp/Base/Version.hpp b/openVulkanoCpp/Base/Version.hpp index f7c5629..b631e5e 100644 --- a/openVulkanoCpp/Base/Version.hpp +++ b/openVulkanoCpp/Base/Version.hpp @@ -34,7 +34,7 @@ namespace OpenVulkano explicit Version(double version); - [[nodiscard]] uint32_t GetComponent(size_t compId) const + [[nodiscard]] uint32_t GetComponent(const size_t compId) const { if (m_versionComponents.size() < compId + 1) return 0u; return m_versionComponents[compId]; @@ -52,7 +52,7 @@ namespace OpenVulkano [[nodiscard]] const std::vector& GetTags() const { return m_tagComponents; } - [[nodiscard]] const std::vector& GetVersionComponents() const { return m_versionComponents; } + [[nodiscard]] const decltype(m_versionComponents)& GetVersionComponents() const { return m_versionComponents; } //region Conversion operators [[nodiscard]] explicit operator uint32_t() const { return (Major() << 20) | ((Minor() & 0x3FF) << 10) | (Patch() & 0x3FF); } @@ -78,8 +78,8 @@ namespace OpenVulkano [[nodiscard]] int CompareComponents(const Version& other) const; }; - static inline Version operator""_v(const char* str) { return { str }; } - static inline Version operator""_version(const char* str) { return { str }; } - static inline Version operator""_v(long double val) { return Version(static_cast(val)); } - static inline Version operator""_version(long double val) { return Version(static_cast(val)); } + static Version operator""_v(const char* str) { return { str }; } + static Version operator""_version(const char* str) { return { str }; } + static Version operator""_v(const long double val) { return Version(static_cast(val)); } + static Version operator""_version(const long double val) { return Version(static_cast(val)); } }