aboutsummaryrefslogtreecommitdiff
path: root/toolsrc/src/vcpkg-test/files.cpp
diff options
context:
space:
mode:
authorNicole Mazzuca <mazzucan@outlook.com>2019-08-09 12:00:43 -0700
committernicole mazzuca <mazzucan@outlook.com>2019-08-10 13:13:21 -0700
commit52b2e740de81d58fbe5fa535c1f66aa82e80951e (patch)
treec61eae92850dea2e5a56cb6d0b3f14fec9c34ae7 /toolsrc/src/vcpkg-test/files.cpp
parent9dfab115aaee2550ad8cf23bfb28a84ff581c936 (diff)
downloadvcpkg-52b2e740de81d58fbe5fa535c1f66aa82e80951e.tar.gz
vcpkg-52b2e740de81d58fbe5fa535c1f66aa82e80951e.zip
[vcpkg] Fix build under /W4
I was building under /W3, because CMake hadn't been set up to build under /W4 -- therefore, I didn't see some warnings. We also decided to remove the niebloids and instead break ADL by using `= delete`, since otherwise we get warnings when we define a local variable with the same name as a niebloid. I also removed `status` and `symlink_status` from the `files` header, since it's unnecessary now, and they're just implementation details of `RealFilesystem`. I also removed some existing uses of unqualified `status(path)`, since that no longer compiles. I also added `Filesystem::canonical`, to remove another use of `fs::stdfs` in a function I was already working in.
Diffstat (limited to 'toolsrc/src/vcpkg-test/files.cpp')
-rw-r--r--toolsrc/src/vcpkg-test/files.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/toolsrc/src/vcpkg-test/files.cpp b/toolsrc/src/vcpkg-test/files.cpp
index a2faf455c..d40edb3bd 100644
--- a/toolsrc/src/vcpkg-test/files.cpp
+++ b/toolsrc/src/vcpkg-test/files.cpp
@@ -145,7 +145,7 @@ namespace
CHECK_EC_ON_FILE(base, ec);
}
- vcpkg::Files::Filesystem& setup(urbg_t& urbg)
+ vcpkg::Files::Filesystem& setup()
{
auto& fs = vcpkg::Files::get_real_filesystem();
@@ -161,7 +161,7 @@ TEST_CASE ("remove all", "[files]")
{
auto urbg = get_urbg(0);
- auto& fs = setup(urbg);
+ auto& fs = setup();
fs::path temp_dir = base_temporary_directory() / get_random_filename(urbg);
INFO("temp dir is: " << temp_dir);
@@ -181,7 +181,7 @@ TEST_CASE ("remove all", "[files]")
TEST_CASE ("remove all -- benchmarks", "[files][!benchmark]")
{
auto urbg = get_urbg(1);
- auto& fs = setup(urbg);
+ auto& fs = setup();
struct
{