From 3d4d815595ed247285700094d0834a8cfac43054 Mon Sep 17 00:00:00 2001 From: Pengfei Date: Thu, 1 Jul 2021 15:34:09 +0800 Subject: [PATCH] Fix build for outdated compilers on CI --- src/common/common_funcs.h | 4 ++-- src/core/importer.cpp | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/common/common_funcs.h b/src/common/common_funcs.h index fad2c6b..f3ae251 100644 --- a/src/common/common_funcs.h +++ b/src/common/common_funcs.h @@ -79,11 +79,11 @@ bool CheckedMemcpy(void* dest, T& container, std::ptrdiff_t offset, std::size_t 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; } -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 | u64(g) << 48 | u64(h) << 56; } diff --git a/src/core/importer.cpp b/src/core/importer.cpp index e8fb146..e075225 100644 --- a/src/core/importer.cpp +++ b/src/core/importer.cpp @@ -566,9 +566,10 @@ static std::string NormalizeFilename(std::string filename) { {':', '/', '\\', '"', '*', '?', '\n', '\r'}}; 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; for (std::size_t i = 0; i < filename.size(); ++i) {