aboutsummaryrefslogtreecommitdiff
path: root/toolsrc/src/vcpkg.cpp
diff options
context:
space:
mode:
authormmazaherit <m.mazaheri.t@gmail.com>2017-06-08 23:53:58 -0400
committermmazaherit <m.mazaheri.t@gmail.com>2017-06-08 23:53:58 -0400
commite544b742903ddceba71d4652f30a9df4baca598e (patch)
tree824fdf1bca936d845c20b51a140e9f60629653cb /toolsrc/src/vcpkg.cpp
parent9b57ecbdd786113e33d8a149d240769682c7846e (diff)
parentff52016d018c9d346cd402e9cc98d24dff39d900 (diff)
downloadvcpkg-e544b742903ddceba71d4652f30a9df4baca598e.tar.gz
vcpkg-e544b742903ddceba71d4652f30a9df4baca598e.zip
Merge branch 'master' of https://github.com/mmazat/vcpkg
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");