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

[vcpkg] fix compile on vs2015 (#14915)

Browse Source 
* [vcpkg] fix compile on vs2015

* format
This commit is contained in:
nicole mazzuca 2020-12-02 12:58:01 -08:00 committed by GitHub
parent d938359602
commit ed5d7b9006
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
toolsrc/src/vcpkg/install.cpp
View File

@ -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,