aboutsummaryrefslogtreecommitdiff
path: root/toolsrc/src/VcpkgPaths.cpp
diff options
context:
space:
mode:
authorAlexander Karatarakis <alkarata@microsoft.com>2017-04-03 16:30:11 -0700
committerAlexander Karatarakis <alkarata@microsoft.com>2017-04-04 16:44:46 -0700
commit898edccbdcec9345c549945187195b75a9f49212 (patch)
treea685eab6c4867b195afede41e4368f61ee46f9c6 /toolsrc/src/VcpkgPaths.cpp
parent3f76b9e53d48e34960bb5947bbbb880ac806281b (diff)
downloadvcpkg-898edccbdcec9345c549945187195b75a9f49212.tar.gz
vcpkg-898edccbdcec9345c549945187195b75a9f49212.zip
exit_code_and_output -> ExitCodeAndOutput
Diffstat (limited to 'toolsrc/src/VcpkgPaths.cpp')
-rw-r--r--toolsrc/src/VcpkgPaths.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/toolsrc/src/VcpkgPaths.cpp b/toolsrc/src/VcpkgPaths.cpp
index 93a181ef5..e4a9de4b1 100644
--- a/toolsrc/src/VcpkgPaths.cpp
+++ b/toolsrc/src/VcpkgPaths.cpp
@@ -70,7 +70,7 @@ namespace vcpkg
{
const fs::path script = scripts_folder / "fetchDependency.ps1";
auto install_cmd = System::create_powershell_script_cmd(script, Strings::wformat(L"-Dependency %s", tool_name));
- System::exit_code_and_output rc = System::cmd_execute_and_capture_output(install_cmd);
+ System::ExitCodeAndOutput rc = System::cmd_execute_and_capture_output(install_cmd);
if (rc.exit_code)
{
System::println(System::color::error, "Launching powershell failed or was denied");
@@ -245,7 +245,7 @@ namespace vcpkg
{
const fs::path script = paths.scripts / "findVisualStudioInstallationInstances.ps1";
const std::wstring cmd = System::create_powershell_script_cmd(script);
- System::exit_code_and_output ec_data = System::cmd_execute_and_capture_output(cmd);
+ System::ExitCodeAndOutput ec_data = System::cmd_execute_and_capture_output(cmd);
Checks::check_exit(VCPKG_LINE_INFO, ec_data.exit_code == 0, "Could not run script to detect VS 2017 instances");
return Strings::split(ec_data.output, "\n");
}