doryan/BloomPatched
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some versions of G++ define macros named 'major' and 'minor', which

Browse Source 
were conflicting with the member initialisers in the VersionNumber
constructor.
This commit is contained in:
Nav
2021-12-28 03:12:36 +00:00
parent 76fcc385f3
commit 72191f922f
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/VersionNumber.cpp
View File

@@ -6,7 +6,7 @@
using namespace Bloom; using namespace Bloom;
VersionNumber::VersionNumber(std::uint16_t major, std::uint16_t minor, std::uint16_t patch) VersionNumber::VersionNumber(std::uint16_t major, std::uint16_t minor, std::uint16_t patch)
: major(major), minor(minor), patch(patch) { : major{major}, minor{minor}, patch{patch} {
this->combined = static_cast<std::uint32_t>( this->combined = static_cast<std::uint32_t>(
std::stoul(std::to_string(this->major) + std::to_string(this->minor) + std::to_string(this->patch)) std::stoul(std::to_string(this->major) + std::to_string(this->minor) + std::to_string(this->patch))
); );