3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-28 11:21:12 +08:00
Code Issues Projects Releases Wiki Activity

Temporarily use get_or_throw()

Browse Source
This commit is contained in:
Alexander Karatarakis 2016-10-04 15:25:53 -07:00
parent 0050125443
commit 8c035ea36a
1 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
toolsrc/src/vcpkg_Dependencies.cpp
View File

@ -32,25 +32,17 @@ namespace vcpkg { namespace Dependencies
for (const std::string& dep_as_string : dependencies_as_string)
{
const expected<package_spec> expected_dep = package_spec::from_name_and_triplet(dep_as_string, spec.target_triplet());
if (auto pdep = expected_dep.get())
const package_spec current_dep = package_spec::from_name_and_triplet(dep_as_string, spec.target_triplet()).get_or_throw();
auto it = status_db.find(current_dep.name(), current_dep.target_triplet());
if (it != status_db.end() && (*it)->want == want_t::install)
{
const package_spec current_dep = *pdep;
auto it = status_db.find(current_dep.name(), current_dep.target_triplet());
if (it != status_db.end() && (*it)->want == want_t::install)
{
continue;
}
graph.add_edge(spec, current_dep);
if (was_examined.find(current_dep) == was_examined.end())
{
examine_stack.push_back(std::move(current_dep));
}
continue;
}
else
graph.add_edge(spec, current_dep);
if (was_examined.find(current_dep) == was_examined.end())
{
std::abort();
examine_stack.push_back(std::move(current_dep));
}
}