aboutsummaryrefslogtreecommitdiff
path: root/toolsrc/src/test_install_plan.cpp
diff options
context:
space:
mode:
authorRobert Schumacher <roschuma@microsoft.com>2017-08-21 17:16:14 -0700
committerRobert Schumacher <roschuma@microsoft.com>2017-08-21 17:16:14 -0700
commit27be8b5c7489ea52156669f8e556ad3db1fd11d1 (patch)
tree619c675091612dcd4be5dbaa9208e229ab1004da /toolsrc/src/test_install_plan.cpp
parentc7de717cbc2b6ab89dc8056984c0a4685e9cf56e (diff)
downloadvcpkg-27be8b5c7489ea52156669f8e556ad3db1fd11d1.tar.gz
vcpkg-27be8b5c7489ea52156669f8e556ad3db1fd11d1.zip
[vcpkg] Fix feature packages for non-default triplets. Reduce duplication between normal installs and feature installs.
Diffstat (limited to 'toolsrc/src/test_install_plan.cpp')
-rw-r--r--toolsrc/src/test_install_plan.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/toolsrc/src/test_install_plan.cpp b/toolsrc/src/test_install_plan.cpp
index f0884c063..939351872 100644
--- a/toolsrc/src/test_install_plan.cpp
+++ b/toolsrc/src/test_install_plan.cpp
@@ -12,7 +12,7 @@ namespace UnitTest1
{
struct PackageSpecMap
{
- std::unordered_map<PackageSpec, SourceControlFile> map;
+ std::unordered_map<std::string, SourceControlFile> map;
Triplet triplet;
PackageSpecMap(const Triplet& t) { triplet = t; }
@@ -24,7 +24,7 @@ namespace UnitTest1
auto spec = PackageSpec::from_name_and_triplet(scf->core_paragraph->name, triplet);
Assert::IsTrue(spec.has_value());
- map.emplace(*spec.get(), std::move(*scf.get()));
+ map.emplace(scf->core_paragraph->name, std::move(*scf.get()));
return PackageSpec{*spec.get()};
}
PackageSpec set_package_map(std::string source, std::string version, std::string build_depends)