updated build system
All checks were successful
BlockStorage/repertory/pipeline/head This commit looks good
All checks were successful
BlockStorage/repertory/pipeline/head This commit looks good
This commit is contained in:
parent
468093227d
commit
a0432be819
@ -225,10 +225,7 @@ template <typename string_t>
|
|||||||
string_t path,
|
string_t path,
|
||||||
const std::vector<std::basic_string_view<typename string_t::value_type>>
|
const std::vector<std::basic_string_view<typename string_t::value_type>>
|
||||||
&paths) -> string_t {
|
&paths) -> string_t {
|
||||||
format_path(path, get_directory_seperator<typename string_t::value_type>(),
|
path = std::accumulate(
|
||||||
get_not_directory_seperator<typename string_t::value_type>());
|
|
||||||
|
|
||||||
return absolute(std::accumulate(
|
|
||||||
paths.begin(), paths.end(), path, [](auto next_path, auto &&path_part) {
|
paths.begin(), paths.end(), path, [](auto next_path, auto &&path_part) {
|
||||||
if (next_path.empty()) {
|
if (next_path.empty()) {
|
||||||
return string_t{path_part};
|
return string_t{path_part};
|
||||||
@ -238,7 +235,9 @@ template <typename string_t>
|
|||||||
string_t{
|
string_t{
|
||||||
get_directory_seperator<typename string_t::value_type>()} +
|
get_directory_seperator<typename string_t::value_type>()} +
|
||||||
string_t{path_part};
|
string_t{path_part};
|
||||||
}));
|
});
|
||||||
|
|
||||||
|
return absolute(path);
|
||||||
}
|
}
|
||||||
|
|
||||||
inline auto combine(std::string path,
|
inline auto combine(std::string path,
|
||||||
|
@ -94,7 +94,8 @@ auto absolute(std::string_view path) -> std::string {
|
|||||||
}
|
}
|
||||||
#endif // defined(_WIN32)
|
#endif // defined(_WIN32)
|
||||||
|
|
||||||
return abs_path;
|
return format_path(abs_path, get_directory_seperator<char>(),
|
||||||
|
get_not_directory_seperator<char>());
|
||||||
}
|
}
|
||||||
|
|
||||||
auto absolute(std::wstring_view path) -> std::wstring {
|
auto absolute(std::wstring_view path) -> std::wstring {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user