From 5aa5cb7941301205b4285163652178b17888d098 Mon Sep 17 00:00:00 2001 From: Oliver Reiche Date: Wed, 4 May 2022 16:24:28 +0200 Subject: install: normalize dir paths --- src/buildtool/build_engine/target_map/utils.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'src/buildtool/build_engine/target_map/utils.cpp') diff --git a/src/buildtool/build_engine/target_map/utils.cpp b/src/buildtool/build_engine/target_map/utils.cpp index 5d80b4c7..bff5d1b8 100644 --- a/src/buildtool/build_engine/target_map/utils.cpp +++ b/src/buildtool/build_engine/target_map/utils.cpp @@ -73,9 +73,8 @@ auto BuildMaps::Target::Utils::keys_expr(const ExpressionPtr& map) return ExpressionPtr{result}; } -namespace { - -auto normal(std::filesystem::path const& p) -> std::filesystem::path { +auto BuildMaps::Target::Utils::normal(std::filesystem::path const& p) + -> std::filesystem::path { auto n = p.lexically_normal(); if (not n.has_filename()) { return n.parent_path(); @@ -83,8 +82,6 @@ auto normal(std::filesystem::path const& p) -> std::filesystem::path { return n; } -} // namespace - auto BuildMaps::Target::Utils::tree_conflict(const ExpressionPtr& map) -> std::optional { std::vector trees{}; -- cgit v1.2.3