From d68444f0d14bd9c29ee14bacde9e9996c20d5d6e Mon Sep 17 00:00:00 2001 From: Nicole Mazzuca Date: Wed, 2 Dec 2020 11:22:14 -0800 Subject: [PATCH 1/2] [vcpkg] fix compile on vs2015 --- toolsrc/src/vcpkg/install.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/toolsrc/src/vcpkg/install.cpp b/toolsrc/src/vcpkg/install.cpp index 8a9fec96326415..c2fd66d31067a8 100644 --- a/toolsrc/src/vcpkg/install.cpp +++ b/toolsrc/src/vcpkg/install.cpp @@ -839,20 +839,20 @@ namespace vcpkg::Install if (args.versions_enabled()) { PortFileProvider::VersionedPortfileProvider verprovider(paths); - auto baseprovider = [&]() -> PortFileProvider::BaselineProvider { + auto baseprovider = [&]() -> std::unique_ptr { 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(paths, p_baseline->string().to_string()); } else { - return PortFileProvider::BaselineProvider(paths); + return std::make_unique(paths); } }(); auto install_plan = Dependencies::create_versioned_install_plan(verprovider, - baseprovider, + *baseprovider, var_provider, manifest_scf.core_paragraph->dependencies, manifest_scf.core_paragraph->overrides, From 09447f12cc43c6f65dd42096715f02c9580f0e76 Mon Sep 17 00:00:00 2001 From: Nicole Mazzuca Date: Wed, 2 Dec 2020 12:03:25 -0800 Subject: [PATCH 2/2] format --- toolsrc/src/vcpkg/install.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/toolsrc/src/vcpkg/install.cpp b/toolsrc/src/vcpkg/install.cpp index c2fd66d31067a8..eee0eca0ed881e 100644 --- a/toolsrc/src/vcpkg/install.cpp +++ b/toolsrc/src/vcpkg/install.cpp @@ -842,7 +842,8 @@ namespace vcpkg::Install auto baseprovider = [&]() -> std::unique_ptr { if (auto p_baseline = manifest_scf.core_paragraph->extra_info.get("$x-default-baseline")) { - return std::make_unique(paths, p_baseline->string().to_string()); + return std::make_unique(paths, + p_baseline->string().to_string()); } else {