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

Switch to C++20

Browse Source
This commit is contained in:
Georg Hagen
2024-06-21 11:57:53 +02:00
parent ca3985cd68
commit 299040ecaf
7 changed files with 28 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
openVulkanoCpp/Base/Version.cpp
View File

@@ -26,7 +26,7 @@ namespace OpenVulkano
ComponentDecodeHolder(const std::string_view& versionStr)
{
if (versionStr.empty()) return;
int offset = 0;
size_t offset = 0;
if (versionStr[0] == 'v' || versionStr[0] == 'V')
{
offset++;
@@ -54,7 +54,7 @@ namespace OpenVulkano
return tmp;
}
static void ReadVersionComponents(std::vector<uint32_t>& comps, const std::string_view& versionStr, int& offset)
static void ReadVersionComponents(std::vector<uint32_t>& comps, const std::string_view& versionStr, size_t& offset)
{
do
{
@@ -66,7 +66,7 @@ namespace OpenVulkano
} while(versionStr.size() > offset);
}
static void ReadTagComponents(std::vector<std::string>& tags, const std::string_view& versionStr, int& offset)
static void ReadTagComponents(std::vector<std::string>& tags, const std::string_view& versionStr, size_t& offset)
{
do
{
@@ -88,11 +88,11 @@ namespace OpenVulkano
}
}
Version::Version(uint32_t major, uint32_t minor, uint32_t patch, 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_buildNumber(build)
#if (__cplusplus >= 202002L)
, m_versionString(std::format(build ? "v{}.{}.{}.{}" : "v{}.{}.{}", major, minor, patch, build))
, m_versionString(std::format("v{}.{}.{}.{}", major, minor, patch, build))
#else
, m_versionString("v" + std::to_string(major) + "." + std::to_string(minor) + "." + std::to_string(patch) + (build ? "." + std::to_string(build) : ""))
#endif