зеркало из https://github.com/microsoft/vcpkg.git
[vcpkg] Fix warning (as error) when building vcpgk/toolsrc with clang++ 10 or g++ 9.3 (see #15148) (#15149)
This commit is contained in:
Родитель
5d41154c42
Коммит
a268c5a7f1
|
@ -12,6 +12,7 @@ namespace vcpkg::PortFileProvider
|
|||
{
|
||||
struct PortFileProvider
|
||||
{
|
||||
virtual ~PortFileProvider() = default;
|
||||
virtual ExpectedS<const SourceControlFileLocation&> get_control_file(const std::string& src_name) const = 0;
|
||||
virtual std::vector<const SourceControlFileLocation*> load_all_control_files() const = 0;
|
||||
};
|
||||
|
|
|
@ -603,7 +603,7 @@ TEST_CASE ("version parse relaxed", "[versionplan]")
|
|||
|
||||
auto version_long =
|
||||
Versions::RelaxedVersion::from_string("1.20.300.4000.50000.6000000.70000000.80000000.18446744073709551610");
|
||||
check_relaxed_version(version_long, {1, 20, 300, 4000, 50000, 6000000, 70000000, 80000000, 18446744073709551610});
|
||||
check_relaxed_version(version_long, {1, 20, 300, 4000, 50000, 6000000, 70000000, 80000000, 18446744073709551610u});
|
||||
|
||||
auto version_invalid_characters = Versions::RelaxedVersion::from_string("1.a.0");
|
||||
CHECK(!version_invalid_characters.has_value());
|
||||
|
|
|
@ -12,7 +12,6 @@ namespace
|
|||
constexpr StringLiteral VERSION_STRING = "version-string";
|
||||
constexpr StringLiteral VERSION_DATE = "version-date";
|
||||
constexpr StringLiteral PORT_VERSION = "port-version";
|
||||
constexpr StringLiteral GIT_TREE = "git-tree";
|
||||
|
||||
struct VersionDeserializer final : Json::IDeserializer<std::string>
|
||||
{
|
||||
|
|
Загрузка…
Ссылка в новой задаче