aboutsummaryrefslogtreecommitdiff
path: root/toolsrc/src
diff options
context:
space:
mode:
authornicole mazzuca <mazzucan@outlook.com>2020-12-02 12:58:01 -0800
committerGitHub <noreply@github.com>2020-12-02 12:58:01 -0800
commited5d7b90064cdffd42b3e9cea2c3d5247f4b9d54 (patch)
tree588df0d03910fa335a6d6328d6d1027cde8fe08a /toolsrc/src
parentd938359602e7e02ffd10950611c34dc1576b3281 (diff)
downloadvcpkg-ed5d7b90064cdffd42b3e9cea2c3d5247f4b9d54.tar.gz
vcpkg-ed5d7b90064cdffd42b3e9cea2c3d5247f4b9d54.zip
[vcpkg] fix compile on vs2015 (#14915)
* [vcpkg] fix compile on vs2015 * format
Diffstat (limited to 'toolsrc/src')
-rw-r--r--toolsrc/src/vcpkg/install.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/toolsrc/src/vcpkg/install.cpp b/toolsrc/src/vcpkg/install.cpp
index 8a9fec963..eee0eca0e 100644
--- a/toolsrc/src/vcpkg/install.cpp
+++ b/toolsrc/src/vcpkg/install.cpp
@@ -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,