mirror of
https://github.com/Dark98/threeSD.git
synced 2026-07-07 08:49:07 +00:00
Fix build for outdated compilers on CI
This commit is contained in:
@@ -79,11 +79,11 @@ bool CheckedMemcpy(void* dest, T& container, std::ptrdiff_t offset, std::size_t
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
consteval u32 MakeMagic(char a, char b, char c, char d) {
|
constexpr u32 MakeMagic(char a, char b, char c, char d) {
|
||||||
return a | b << 8 | c << 16 | d << 24;
|
return a | b << 8 | c << 16 | d << 24;
|
||||||
}
|
}
|
||||||
|
|
||||||
consteval u64 MakeMagic(char a, char b, char c, char d, char e, char f, char g, char h) {
|
constexpr u64 MakeMagic(char a, char b, char c, char d, char e, char f, char g, char h) {
|
||||||
return u64(a) | u64(b) << 8 | u64(c) << 16 | u64(d) << 24 | u64(e) << 32 | u64(f) << 40 |
|
return u64(a) | u64(b) << 8 | u64(c) << 16 | u64(d) << 24 | u64(e) << 32 | u64(f) << 40 |
|
||||||
u64(g) << 48 | u64(h) << 56;
|
u64(g) << 48 | u64(h) << 56;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -566,9 +566,10 @@ static std::string NormalizeFilename(std::string filename) {
|
|||||||
{':', '/', '\\', '"', '*', '?', '\n', '\r'}};
|
{':', '/', '\\', '"', '*', '?', '\n', '\r'}};
|
||||||
|
|
||||||
const auto pred = [](char c) {
|
const auto pred = [](char c) {
|
||||||
return std::ranges::find(IllegalCharacters, c) != IllegalCharacters.end();
|
return std::find(IllegalCharacters.begin(), IllegalCharacters.end(), c) !=
|
||||||
|
IllegalCharacters.end();
|
||||||
};
|
};
|
||||||
std::ranges::replace_if(filename, pred, ' ');
|
std::replace_if(filename.begin(), filename.end(), pred, ' ');
|
||||||
|
|
||||||
std::string result;
|
std::string result;
|
||||||
for (std::size_t i = 0; i < filename.size(); ++i) {
|
for (std::size_t i = 0; i < filename.size(); ++i) {
|
||||||
|
|||||||
Reference in New Issue
Block a user