GeorgH93/OpenVulkano
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Silence some warnings

Browse Source
This commit is contained in:
Georg Hagen
2025-10-27 13:54:11 +01:00
parent 4763767a9b
commit c1a7a3a4e4
2 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
openVulkanoCpp/Base/Version.cpp
View File

@@ -88,13 +88,12 @@ namespace OpenVulkano
{ {
if (build) if (build)
return fmt::format("v{}.{}.{}.{}", major, minor, patch, 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) Version::Version(uint32_t major, uint32_t minor, uint32_t patch, const uint32_t build)
: m_versionComponents(build ? std::initializer_list<uint32_t>{major, minor, patch, build} : std::initializer_list<uint32_t>{major, minor, patch}) : m_versionComponents(build ? std::initializer_list{major, minor, patch, build} : std::initializer_list{major, minor, patch})
, m_buildNumber(build) , m_buildNumber(build)
, m_versionString(ToString(major, minor, patch, build)) , m_versionString(ToString(major, minor, patch, build))
{} {}
@@ -135,7 +134,7 @@ namespace OpenVulkano
} }
//region Compare functions //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 == 0 || other.m_buildNumber == 0) return 0;
if (m_buildNumber > other.m_buildNumber) return 1; if (m_buildNumber > other.m_buildNumber) return 1;
@@ -170,7 +169,7 @@ namespace OpenVulkano
return 0; return 0;
} }
int Version::Compare(const OpenVulkano::Version& other) const int Version::Compare(const Version& other) const
{ {
int comp; int comp;
if ((comp = CompareComponents(other)) != 0) return comp; if ((comp = CompareComponents(other)) != 0) return comp;
@@ -181,7 +180,7 @@ namespace OpenVulkano
namespace namespace
{ {
uint32_t GetDigits(double val) uint32_t GetDigits(const double val)
{ {
if (val == 0) return 0; if (val == 0) return 0;
std::string fracStr = std::to_string(val); 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<uint32_t>(version), GetDigits(version)) : Version(static_cast<uint32_t>(version), GetDigits(version))
{} {}
} }

12
openVulkanoCpp/Base/Version.hpp
View File

@@ -34,7 +34,7 @@ namespace OpenVulkano
explicit Version(double version); 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; if (m_versionComponents.size() < compId + 1) return 0u;
return m_versionComponents[compId]; return m_versionComponents[compId];
@@ -52,7 +52,7 @@ namespace OpenVulkano
[[nodiscard]] const std::vector<std::string>& GetTags() const { return m_tagComponents; } [[nodiscard]] const std::vector<std::string>& GetTags() const { return m_tagComponents; }
[[nodiscard]] const std::vector<uint32_t>& GetVersionComponents() const { return m_versionComponents; } [[nodiscard]] const decltype(m_versionComponents)& GetVersionComponents() const { return m_versionComponents; }
//region Conversion operators //region Conversion operators
[[nodiscard]] explicit operator uint32_t() const { return (Major() << 20) | ((Minor() & 0x3FF) << 10) | (Patch() & 0x3FF); } [[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; [[nodiscard]] int CompareComponents(const Version& other) const;
}; };
static inline Version operator""_v(const char* str) { return { str }; } static Version operator""_v(const char* str) { return { str }; }
static inline Version operator""_version(const char* str) { return { str }; } static Version operator""_version(const char* str) { return { str }; }
static inline Version operator""_v(long double val) { return Version(static_cast<double>(val)); } static Version operator""_v(const long double val) { return Version(static_cast<double>(val)); }
static inline Version operator""_version(long double val) { return Version(static_cast<double>(val)); } static Version operator""_version(const long double val) { return Version(static_cast<double>(val)); }
} }