aboutsummaryrefslogtreecommitdiff
path: root/src/fs.cpp
diff options
context:
space:
mode:
authorKiminuo <kiminuo@protonmail.com>2021-01-13 15:44:40 +0100
committerKiminuo <kiminuo@protonmail.com>2021-01-15 22:48:15 +0100
commitda9caa1cedd69702aea44cb44b2fd0a2d6d56916 (patch)
treefc2198dea8c7c5f0cd91b7df259afd1a4c90efd7 /src/fs.cpp
parent66576c4fd532ac18b8b355ea93d25581a2c15654 (diff)
Replace fs::absolute calls with AbsPathJoin calls
This adds better test coverage and will make it easier in #20744 to remove our dependency on the two-argument boost::filesystem::absolute() function which does not have a direct equivalent in C++17.
Diffstat (limited to 'src/fs.cpp')
-rw-r--r--src/fs.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/fs.cpp b/src/fs.cpp
index 7eb0f5ca9f..4f20ca4d28 100644
--- a/src/fs.cpp
+++ b/src/fs.cpp
@@ -31,6 +31,12 @@ FILE *fopen(const fs::path& p, const char *mode)
#endif
}
+fs::path AbsPathJoin(const fs::path& base, const fs::path& path)
+{
+ assert(base.is_absolute());
+ return fs::absolute(path, base);
+}
+
#ifndef WIN32
static std::string GetErrorReason()