mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-06-07 21:42:48 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[vcpkg] fix bug in Filesystem::absolute (#11170)

Browse Source 
* [vcpkg] fix bug in Filesystem::absolute

* flip the conditional for billy
This commit is contained in:
nicole mazzuca 2020-05-04 15:25:38 -07:00 committed by GitHub
parent 63e1d87432
commit 46bf8c52cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
toolsrc/src/vcpkg/base/files.cpp
View File

@ -717,7 +717,7 @@ namespace vcpkg::Files
virtual fs::path absolute(const fs::path& path, std::error_code& ec) const override virtual fs::path absolute(const fs::path& path, std::error_code& ec) const override
{ {
#if VCPKG_USE_STD_FILESYSTEM #if VCPKG_USE_STD_FILESYSTEM
return fs::stdfs::absolute(path, ec); return fs::stdfs::absolute(path, ec);
#else // ^^^ VCPKG_USE_STD_FILESYSTEM / !VCPKG_USE_STD_FILESYSTEM vvv #else // ^^^ VCPKG_USE_STD_FILESYSTEM / !VCPKG_USE_STD_FILESYSTEM vvv
#if _WIN32 #if _WIN32
@ -725,11 +725,11 @@ namespace vcpkg::Files
return fs::stdfs::system_complete(path, ec); return fs::stdfs::system_complete(path, ec);
#else // ^^^ _WIN32 / !_WIN32 vvv #else // ^^^ _WIN32 / !_WIN32 vvv
if (path.is_absolute()) { if (path.is_absolute()) {
return path;
} else {
auto current_path = this->current_path(ec); auto current_path = this->current_path(ec);
if (ec) return fs::path(); if (ec) return fs::path();
return std::move(current_path) / path; return std::move(current_path) / path;
} else {
return path;
} }
#endif #endif
#endif #endif