aboutsummaryrefslogtreecommitdiff
path: root/toolsrc/src/vcpkg.cpp
diff options
context:
space:
mode:
authorAlexander Karatarakis <alkarata@microsoft.com>2017-03-28 12:57:00 -0700
committerAlexander Karatarakis <alkarata@microsoft.com>2017-03-28 18:48:03 -0700
commit67ce764c2ea7483860a3ad61441608d8978605ae (patch)
tree74f64562082ea1df5c2e19e81b5106cd1b4f9741 /toolsrc/src/vcpkg.cpp
parentdb4d1df5f0ecd476aae2869828b6060484133438 (diff)
downloadvcpkg-67ce764c2ea7483860a3ad61441608d8978605ae.tar.gz
vcpkg-67ce764c2ea7483860a3ad61441608d8978605ae.zip
[expected] Now uses exit variants instead of throw variants
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 4caeb93e1..48c0c7e32 100644
--- a/toolsrc/src/vcpkg.cpp
+++ b/toolsrc/src/vcpkg.cpp
@@ -60,7 +60,7 @@ static void inner(const vcpkg_cmd_arguments& args)
const expected<vcpkg_paths> expected_paths = vcpkg_paths::create(vcpkg_root_dir);
Checks::check_exit(VCPKG_LINE_INFO, !expected_paths.error_code(), "Error: Invalid vcpkg root directory %s: %s", vcpkg_root_dir.string(), expected_paths.error_code().message());
- const vcpkg_paths paths = expected_paths.get_or_throw(VCPKG_LINE_INFO);
+ const vcpkg_paths paths = expected_paths.get_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");
@@ -111,7 +111,7 @@ static void loadConfig()
try
{
- auto pghs = Paragraphs::get_paragraphs(localappdata / "vcpkg" / "config").get_or_throw(VCPKG_LINE_INFO);
+ auto pghs = Paragraphs::get_paragraphs(localappdata / "vcpkg" / "config").get_or_exit(VCPKG_LINE_INFO);
std::unordered_map<std::string, std::string> keys;
if (pghs.size() > 0)
keys = pghs[0];