Skip to content

[vcpkg] fix compile on vs2015 #14915

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
strega-nil merged 2 commits into from
Dec 2, 2020
Merged

[vcpkg] fix compile on vs2015 #14915

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d68444f
[vcpkg] fix compile on vs2015
strega-nil Dec 2, 2020
09447f1
format
strega-nil Dec 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions toolsrc/src/vcpkg/install.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -839,20 +839,21 @@ namespace vcpkg::Install
if (args.versions_enabled())
{
PortFileProvider::VersionedPortfileProvider verprovider(paths);
auto baseprovider = [&]() -> PortFileProvider::BaselineProvider {
auto baseprovider = [&]() -> std::unique_ptr<PortFileProvider::BaselineProvider> {
if (auto p_baseline = manifest_scf.core_paragraph->extra_info.get("$x-default-baseline"))
{
return PortFileProvider::BaselineProvider(paths, p_baseline->string().to_string());
return std::make_unique<PortFileProvider::BaselineProvider>(paths,
p_baseline->string().to_string());
}
else
{
return PortFileProvider::BaselineProvider(paths);
return std::make_unique<PortFileProvider::BaselineProvider>(paths);
}
}();

auto install_plan =
Dependencies::create_versioned_install_plan(verprovider,
baseprovider,
*baseprovider,
var_provider,
manifest_scf.core_paragraph->dependencies,
manifest_scf.core_paragraph->overrides,
Expand Down