aboutsummaryrefslogtreecommitdiff
path: root/toolsrc/src
diff options
context:
space:
mode:
authorNicole Mazzuca <t-nimaz@microsoft.com>2019-07-10 15:42:13 -0700
committerNicole Mazzuca <t-nimaz@microsoft.com>2019-07-11 18:20:35 -0700
commit3b6d6b3465e0e79999e5995f0104a6e8c021088c (patch)
tree48921cf0838e39e5901304c156adc13353bf22a5 /toolsrc/src
parent43493b56df7c8f7aab02256ab7f65135d4dd1d4c (diff)
downloadvcpkg-3b6d6b3465e0e79999e5995f0104a6e8c021088c.tar.gz
vcpkg-3b6d6b3465e0e79999e5995f0104a6e8c021088c.zip
actually get the code compiling
Diffstat (limited to 'toolsrc/src')
-rw-r--r--toolsrc/src/vcpkg/base/files.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/toolsrc/src/vcpkg/base/files.cpp b/toolsrc/src/vcpkg/base/files.cpp
index e89c531be..d8a982164 100644
--- a/toolsrc/src/vcpkg/base/files.cpp
+++ b/toolsrc/src/vcpkg/base/files.cpp
@@ -1,7 +1,6 @@
#include "pch.h"
#include <vcpkg/base/files.h>
-#include <vcpkg/base/rng.h>
#include <vcpkg/base/system.debug.h>
#include <vcpkg/base/system.h>
#include <vcpkg/base/system.print.h>
@@ -57,7 +56,9 @@ namespace fs {
file_status decltype(symlink_status)::operator()(const path& p) const noexcept {
std::error_code ec;
auto result = symlink_status(p, ec);
- if (ec) vcpkg::Checks::exit_with_message(VCPKG_LINE_INFO, "error getting status of path %s: %s", p, ec.message());
+ if (ec) vcpkg::Checks::exit_with_message(VCPKG_LINE_INFO, "error getting status of path %s: %s", p.string(), ec.message());
+
+ return result;
}
}
@@ -393,11 +394,11 @@ namespace vcpkg::Files
std::mutex ec_mutex;
auto queue = remove::queue([&] {
- index += 1 << 32;
+ index += static_cast<std::uint64_t>(1) << 32;
return remove::tld{path, index, files_deleted, ec_mutex, ec};
});
- index += 1 << 32;
+ index += static_cast<std::uint64_t>(1) << 32;
auto main_tld = remove::tld{path, index, files_deleted, ec_mutex, ec};
for (const auto& entry : fs::stdfs::directory_iterator(path)) {
remove{}(entry, main_tld, queue);