aboutsummaryrefslogtreecommitdiff
path: root/toolsrc/src/vcpkg.cpp
diff options
context:
space:
mode:
authoratkawa7 <atkawa7@yahoo.com>2017-06-13 17:12:54 -0700
committeratkawa7 <atkawa7@yahoo.com>2017-06-13 17:12:54 -0700
commitaa83671a723da212e640990ef9b9efafccba8af1 (patch)
treef50d482f3d2b4e3545a672eb58712ac553d272de /toolsrc/src/vcpkg.cpp
parent9a409006cf7ec63bebe0d9341799b5cb529155ae (diff)
parent548ff8d3db47e83ebecc5b57dcbd63723cee7546 (diff)
downloadvcpkg-aa83671a723da212e640990ef9b9efafccba8af1.tar.gz
vcpkg-aa83671a723da212e640990ef9b9efafccba8af1.zip
Merge https://github.com/Microsoft/vcpkg into live555
Diffstat (limited to 'toolsrc/src/vcpkg.cpp')
-rw-r--r--toolsrc/src/vcpkg.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/toolsrc/src/vcpkg.cpp b/toolsrc/src/vcpkg.cpp
index 154aefd0a..738b7b284 100644
--- a/toolsrc/src/vcpkg.cpp
+++ b/toolsrc/src/vcpkg.cpp
@@ -61,10 +61,10 @@ static void inner(const VcpkgCmdArguments& args)
const Expected<VcpkgPaths> expected_paths = VcpkgPaths::create(vcpkg_root_dir);
Checks::check_exit(VCPKG_LINE_INFO,
- !expected_paths.error_code(),
+ !expected_paths.error(),
"Error: Invalid vcpkg root directory %s: %s",
vcpkg_root_dir.string(),
- expected_paths.error_code().message());
+ expected_paths.error().message());
const VcpkgPaths paths = expected_paths.value_or_exit(VCPKG_LINE_INFO);
int exit_code = _wchdir(paths.root.c_str());
Checks::check_exit(VCPKG_LINE_INFO, exit_code == 0, "Changing the working dir failed");