[vcpkg] Fix the build on VS2015 debug (#7637)

The VS2015 standard library requires, in debug mode, a comparison
operator on `T × U` and `U × T` to also be a comparison operator on
`T × T` and on `U × U`, and so in
vcpkg::Install::install_package::intersection_compare, I've added two
new `operator()` overloads which take those respectively, on VS2015.

Also, `[nodiscard]` was added to somewhere in `vcpkg/base/strings.h`,
which gives a warning in VS2015 -- thus, I added the `vcpkg/pragmas.h`
include, since that fixes the warning.
This commit is contained in:
nicole mazzuca 2019-08-12 14:02:59 -07:00 committed by Victor Romero
parent da61a933fc
commit 875648e10b
2 changed files with 8 additions and 0 deletions

View File

@ -1,10 +1,12 @@
#pragma once
#include <vcpkg/base/cstringview.h>
#include <vcpkg/base/optional.h>
#include <vcpkg/base/stringliteral.h>
#include <vcpkg/base/stringview.h>
#include <vcpkg/base/view.h>
#include <vcpkg/pragmas.h>
#include <vector>

View File

@ -202,6 +202,12 @@ namespace vcpkg::Install
struct intersection_compare
{
// The VS2015 standard library requires comparison operators of T and U
// to also support comparison of T and T, and of U and U, due to debug checks.
#if _MSC_VER < 1910
bool operator()(const std::string& lhs, const std::string& rhs) { return lhs < rhs; }
bool operator()(const file_pack& lhs, const file_pack& rhs) { return lhs.first < rhs.first; }
#endif
bool operator()(const std::string& lhs, const file_pack& rhs) { return lhs < rhs.first; }
bool operator()(const file_pack& lhs, const std::string& rhs) { return lhs.first < rhs; }
};